s3-build: only include krb5 environment variables where required.

[ira/wip.git] / source3 / lib / netapi / netapi.c

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 6d27b99d96767fd1c81371754162123df0808b15..c4c2556b0bb2908c91473de827093a1059a47050 100644 (file)
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -19,6 +19,9 @@
 
 #include "includes.h"
 #include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
+#include "secrets.h"
+#include "krb5_env.h"
 
 extern bool AllowDebugChange;
 
@@ -29,8 +32,30 @@ static bool libnetapi_initialized = false;
 /****************************************************************
 ****************************************************************/
 
+static NET_API_STATUS libnetapi_init_private_context(struct libnetapi_ctx *ctx)
+{
+       struct libnetapi_private_ctx *priv;
+
+       if (!ctx) {
+               return W_ERROR_V(WERR_INVALID_PARAM);
+       }
+
+       priv = TALLOC_ZERO_P(ctx, struct libnetapi_private_ctx);
+       if (!priv) {
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+       ctx->private_data = priv;
+
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
 NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 {
+       NET_API_STATUS status;
        struct libnetapi_ctx *ctx = NULL;
        char *krb5_cc_env = NULL;
 
@@ -39,6 +64,9 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                return NET_API_STATUS_SUCCESS;
        }
 
+#if 0
+       talloc_enable_leak_report();
+#endif
        frame = talloc_stackframe();
 
        ctx = talloc_zero(frame, struct libnetapi_ctx);
@@ -47,7 +75,12 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                return W_ERROR_V(WERR_NOMEM);
        }
 
-       DEBUGLEVEL = 0;
+       if (!DEBUGLEVEL) {
+               DEBUGLEVEL = 0;
+       }
+
+       /* prevent setup_logging() from closing x_stderr... */
+       dbf = 0;
        setup_logging("libnetapi", true);
 
        dbf = x_stderr;
@@ -58,6 +91,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 
        if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) {
                TALLOC_FREE(frame);
+               fprintf(stderr, "error loading %s\n", get_dyn_CONFIGFILE() );
                return W_ERROR_V(WERR_GENERAL_FAILURE);
        }
 
@@ -75,6 +109,23 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
        }
 
+       if (getenv("USER")) {
+               ctx->username = talloc_strdup(frame, getenv("USER"));
+       } else {
+               ctx->username = talloc_strdup(frame, "");
+       }
+       if (!ctx->username) {
+               TALLOC_FREE(frame);
+               fprintf(stderr, "libnetapi_init: out of memory\n");
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+       status = libnetapi_init_private_context(ctx);
+       if (status != 0) {
+               TALLOC_FREE(frame);
+               return status;
+       }
+
        libnetapi_initialized = true;
 
        *context = stat_ctx = ctx;
@@ -100,20 +151,28 @@ NET_API_STATUS libnetapi_getctx(struct libnetapi_ctx **ctx)
 
 NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx)
 {
+       if (!ctx) {
+               return NET_API_STATUS_SUCCESS;
+       }
+
+       libnetapi_samr_free(ctx);
+
+       libnetapi_shutdown_cm(ctx);
+
+       if (ctx->krb5_cc_env) {
+               char *env = getenv(KRB5_ENV_CCNAME);
+               if (env && (strequal(ctx->krb5_cc_env, env))) {
+                       unsetenv(KRB5_ENV_CCNAME);
+               }
+       }
+
        gfree_names();
        gfree_loadparm();
        gfree_case_tables();
        gfree_charcnv();
        gfree_interfaces();
 
-       gencache_shutdown();
        secrets_shutdown();
-       regdb_close();
-
-       if (ctx->krb5_cc_env &&
-           (strequal(ctx->krb5_cc_env, getenv(KRB5_ENV_CCNAME)))) {
-               unsetenv(KRB5_ENV_CCNAME);
-       }
 
        TALLOC_FREE(ctx);
        TALLOC_FREE(frame);
@@ -130,7 +189,7 @@ NET_API_STATUS libnetapi_set_debuglevel(struct libnetapi_ctx *ctx,
                                        const char *debuglevel)
 {
        AllowDebugChange = true;
-       ctx->debuglevel = debuglevel;
+       ctx->debuglevel = talloc_strdup(ctx, debuglevel);
        if (!debug_parse_levels(debuglevel)) {
                return W_ERROR_V(WERR_GENERAL_FAILURE);
        }
@@ -141,7 +200,7 @@ NET_API_STATUS libnetapi_set_debuglevel(struct libnetapi_ctx *ctx,
 ****************************************************************/
 
 NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx,
-                                       const char **debuglevel)
+                                       char **debuglevel)
 {
        *debuglevel = ctx->debuglevel;
        return NET_API_STATUS_SUCCESS;
@@ -154,7 +213,8 @@ NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx,
                                      const char *username)
 {
        TALLOC_FREE(ctx->username);
-       ctx->username = talloc_strdup(ctx, username);
+       ctx->username = talloc_strdup(ctx, username ? username : "");
+
        if (!ctx->username) {
                return W_ERROR_V(WERR_NOMEM);
        }
@@ -186,8 +246,22 @@ NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-const char *libnetapi_errstr(struct libnetapi_ctx *ctx,
-                            NET_API_STATUS status)
+NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx)
+{
+       ctx->use_kerberos = true;
+       return NET_API_STATUS_SUCCESS;
+}
+
+NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx)
+{
+       ctx->use_ccache = true;
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
+const char *libnetapi_errstr(NET_API_STATUS status)
 {
        if (status & 0xc0000000) {
                return get_friendly_nt_error_msg(NT_STATUS(status));
@@ -195,3 +269,87 @@ const char *libnetapi_errstr(struct libnetapi_ctx *ctx,
 
        return get_friendly_werror_msg(W_ERROR(status));
 }
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx,
+                                         const char *format, ...)
+{
+       va_list args;
+
+       TALLOC_FREE(ctx->error_string);
+
+       va_start(args, format);
+       ctx->error_string = talloc_vasprintf(ctx, format, args);
+       va_end(args);
+
+       if (!ctx->error_string) {
+               return W_ERROR_V(WERR_NOMEM);
+       }
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
+const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
+                                      NET_API_STATUS status_in)
+{
+       NET_API_STATUS status;
+       struct libnetapi_ctx *tmp_ctx = ctx;
+
+       if (!tmp_ctx) {
+               status = libnetapi_getctx(&tmp_ctx);
+               if (status != 0) {
+                       return NULL;
+               }
+       }
+
+       if (tmp_ctx->error_string) {
+               return tmp_ctx->error_string;
+       }
+
+       return libnetapi_errstr(status_in);
+}
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS NetApiBufferAllocate(uint32_t byte_count,
+                                   void **buffer)
+{
+       void *buf = NULL;
+
+       if (!buffer) {
+               return W_ERROR_V(WERR_INSUFFICIENT_BUFFER);
+       }
+
+       if (byte_count == 0) {
+               goto done;
+       }
+
+       buf = talloc_size(NULL, byte_count);
+       if (!buf) {
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+ done:
+       *buffer = buf;
+
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS NetApiBufferFree(void *buffer)
+{
+       if (!buffer) {
+               return W_ERROR_V(WERR_INSUFFICIENT_BUFFER);
+       }
+
+       talloc_free(buffer);
+
+       return NET_API_STATUS_SUCCESS;
+}