s3-libnetapi Don't create a talloc_stackframe() in a global variable

This also ensures that libnetapi_free() invalidates the global
stat_ctx variable, and changes the API so that the behaviour of the
error string routines is to consistently return a allocated string.

Pair-Programmed-With: Günther Deschner <gd@samba.org>

Andrew Bartlett

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index cd590273ce2e997e8cd571a05831645ea0813bed..255e0930b8472796578c3eae6b02fb12b5bb7b07 100644 (file)
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -24,7 +24,6 @@
 #include "krb5_env.h"
 
 struct libnetapi_ctx *stat_ctx = NULL;
-TALLOC_CTX *frame = NULL;
 static bool libnetapi_initialized = false;
 
 /****************************************************************
@@ -57,6 +56,8 @@ were not expecting it.
 
 NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 {
+       NET_API_STATUS ret;
+       TALLOC_CTX *frame;
        if (stat_ctx && libnetapi_initialized) {
                *context = stat_ctx;
                return NET_API_STATUS_SUCCESS;
@@ -88,7 +89,9 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 
        BlockSignals(True, SIGPIPE);
 
-       return libnetapi_net_init(context);
+       ret = libnetapi_net_init(context);
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 /****************************************************************
@@ -105,7 +108,7 @@ NET_API_STATUS libnetapi_net_init(struct libnetapi_ctx **context)
        struct libnetapi_ctx *ctx = NULL;
        char *krb5_cc_env = NULL;
 
-       frame = talloc_stackframe();
+       TALLOC_CTX *frame = talloc_stackframe();
 
        ctx = talloc_zero(frame, struct libnetapi_ctx);
        if (!ctx) {
@@ -117,14 +120,14 @@ NET_API_STATUS libnetapi_net_init(struct libnetapi_ctx **context)
 
        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
        if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-               ctx->krb5_cc_env = talloc_strdup(frame, "MEMORY:libnetapi");
+               ctx->krb5_cc_env = talloc_strdup(ctx, "MEMORY:libnetapi");
                setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
        }
 
        if (getenv("USER")) {
-               ctx->username = talloc_strdup(frame, getenv("USER"));
+               ctx->username = talloc_strdup(ctx, getenv("USER"));
        } else {
-               ctx->username = talloc_strdup(frame, "");
+               ctx->username = talloc_strdup(ctx, "");
        }
        if (!ctx->username) {
                TALLOC_FREE(frame);
@@ -140,8 +143,10 @@ NET_API_STATUS libnetapi_net_init(struct libnetapi_ctx **context)
 
        libnetapi_initialized = true;
 
+       talloc_steal(NULL, ctx);
        *context = stat_ctx = ctx;
-
+       
+       TALLOC_FREE(frame);
        return NET_API_STATUS_SUCCESS;
 }
 
@@ -187,8 +192,10 @@ NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx)
 
        secrets_shutdown();
 
+       if (ctx == stat_ctx) {
+               stat_ctx = NULL;
+       }
        TALLOC_FREE(ctx);
-       TALLOC_FREE(frame);
 
        gfree_debugsyms();
 
@@ -202,10 +209,14 @@ NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx)
 NET_API_STATUS libnetapi_set_debuglevel(struct libnetapi_ctx *ctx,
                                        const char *debuglevel)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        ctx->debuglevel = talloc_strdup(ctx, debuglevel);
+       
        if (!lp_set_cmdline("log level", debuglevel)) {
+               TALLOC_FREE(frame);
                return W_ERROR_V(WERR_GENERAL_FAILURE);
        }
+       TALLOC_FREE(frame);
        return NET_API_STATUS_SUCCESS;
 }
 
@@ -272,15 +283,21 @@ NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx)
 }
 
 /****************************************************************
+Return a libnetapi error as a string, caller must free with NetApiBufferFree
 ****************************************************************/
 
-const char *libnetapi_errstr(NET_API_STATUS status)
+char *libnetapi_errstr(NET_API_STATUS status)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
+       char *ret;
        if (status & 0xc0000000) {
-               return get_friendly_nt_error_msg(NT_STATUS(status));
+               ret = talloc_strdup(NULL, 
+                                    get_friendly_nt_error_msg(NT_STATUS(status)));
        }
 
-       return get_friendly_werror_msg(W_ERROR(status));
+       ret = talloc_strdup(NULL, get_friendly_werror_msg(W_ERROR(status)));
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 /****************************************************************
@@ -304,9 +321,10 @@ NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx,
 }
 
 /****************************************************************
+Return a libnetapi_errstr(), caller must free with NetApiBufferFree
 ****************************************************************/
 
-const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
+char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
                                       NET_API_STATUS status_in)
 {
        NET_API_STATUS status;
@@ -320,7 +338,7 @@ const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
        }
 
        if (tmp_ctx->error_string) {
-               return tmp_ctx->error_string;
+               return talloc_strdup(NULL, tmp_ctx->error_string);
        }
 
        return libnetapi_errstr(status_in);

diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index 9e1549df0eb3ed0551bb618272917dd8c35abe8c..620d8cf5910f7281cb960a461c506b740d379be5 100644 (file)
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -1411,15 +1411,18 @@ NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx);
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx);
 
 /****************************************************************
+Return a specific libnetapi error as a string, caller must free with NetApiBufferFree
 ****************************************************************/
 
-const char *libnetapi_errstr(NET_API_STATUS status);
+char *libnetapi_errstr(NET_API_STATUS status);
 
 /****************************************************************
+Return the last libnetapi error as a string, caller must free with NetApiBufferFree
+ctx is optional
 ****************************************************************/
 
-const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
-                                      NET_API_STATUS status);
+char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
+                                NET_API_STATUS status);
 
 /****************************************************************
  NetApiBufferAllocate