libnetapi: do not overwrite status in libnetapi_get_error_string().

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

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 351610535330972f4d63076906786b6a0a1478b9..941e3231835293ec09681df7124325a1819b4538 100644 (file)
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
 
 extern bool AllowDebugChange;
 
@@ -50,7 +51,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;
@@ -61,6 +67,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, "lp_load failed\n");
                return W_ERROR_V(WERR_GENERAL_FAILURE);
        }
 
@@ -78,6 +85,13 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
        }
 
+       ctx->username = talloc_strdup(frame, getenv("USER"));
+       if (!ctx->username) {
+               TALLOC_FREE(frame);
+               fprintf(stderr, "out of memory\n");
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
        libnetapi_initialized = true;
 
        *context = stat_ctx = ctx;
@@ -103,6 +117,11 @@ 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_shutdown_cm(ctx);
 
        if (ctx->krb5_cc_env) {
                char *env = getenv(KRB5_ENV_CCNAME);
@@ -119,7 +138,6 @@ NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx)
 
        gencache_shutdown();
        secrets_shutdown();
-       regdb_close();
 
        TALLOC_FREE(ctx);
        TALLOC_FREE(frame);
@@ -160,7 +178,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);
        }
@@ -192,8 +211,16 @@ 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;
+}
+
+/****************************************************************
+****************************************************************/
+
+const char *libnetapi_errstr(NET_API_STATUS status)
 {
        if (status & 0xc0000000) {
                return get_friendly_nt_error_msg(NT_STATUS(status));
@@ -206,21 +233,55 @@ const char *libnetapi_errstr(struct libnetapi_ctx *ctx,
 ****************************************************************/
 
 NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx,
-                                         const char *error_string)
+                                         const char *format, ...)
 {
+       va_list args;
+
        TALLOC_FREE(ctx->error_string);
-       ctx->error_string = talloc_strdup(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);
 }
 
 /****************************************************************
 ****************************************************************/
 
-const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx)
+NET_API_STATUS NetApiBufferFree(void *buffer)
 {
-       return ctx->error_string;
+       if (!buffer) {
+               return W_ERROR_V(WERR_INSUFFICIENT_BUFFER);
+       }
+
+       talloc_free(buffer);
+
+       return NET_API_STATUS_SUCCESS;
 }