Changeset 745 for trunk/server/source3/lib/netapi/netapi.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/netapi/netapi.c (modified) (8 diffs)

trunk/server/source3/lib/netapi/netapi.c

@@ -21 +21 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
-
-extern bool AllowDebugChange;
+#include "secrets.h"
+#include "krb5_env.h"
 
 struct libnetapi_ctx *stat_ctx = NULL;
@@ -50 +50 @@
 
 /****************************************************************
+Create a libnetapi context, for use in non-Samba applications.  This
+loads the smb.conf file and sets the debug level to 0, so that
+applications are not flooded with debug logs at level 10, when they
+were not expecting it.
 ****************************************************************/
 
 NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 {
-        NET_API_STATUS status;
-        struct libnetapi_ctx *ctx = NULL;
-        char *krb5_cc_env = NULL;
-
         if (stat_ctx && libnetapi_initialized) {
                 *context = stat_ctx;
@@ -68 +68 @@
         frame = talloc_stackframe();
 
-        ctx = talloc_zero(frame, struct libnetapi_ctx);
-        if (!ctx) {
-                TALLOC_FREE(frame);
-                return W_ERROR_V(WERR_NOMEM);
-        }
-
-        if (!DEBUGLEVEL) {
-                DEBUGLEVEL = 0;
-        }
-
-        /* prevent setup_logging() from closing x_stderr... */
-        dbf = 0;
-        setup_logging("libnetapi", true);
-
-        dbf = x_stderr;
-        x_setbuf(x_stderr, NULL);
-        AllowDebugChange = false;
-
-        load_case_tables();
+        /* Case tables must be loaded before any string comparisons occour */
+        load_case_tables_library();
+
+        /* When libnetapi is invoked from an application, it does not
+         * want to be swamped with level 10 debug messages, even if
+         * this has been set for the server in smb.conf */
+        lp_set_cmdline("log level", "0");
+        setup_logging("libnetapi", DEBUG_STDERR);
 
         if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) {
@@ -94 +83 @@
         }
 
-        AllowDebugChange = true;
-
         init_names();
         load_interfaces();
         reopen_logs();
+
+        BlockSignals(True, SIGPIPE);
+
+        return libnetapi_net_init(context);
+}
+
+/****************************************************************
+Create a libnetapi context, for use inside the 'net' binary.
+
+As we know net has already loaded the smb.conf file, and set the debug
+level etc, this avoids doing so again (which causes trouble with -d on
+the command line).
+****************************************************************/
+
+NET_API_STATUS libnetapi_net_init(struct libnetapi_ctx **context)
+{
+        NET_API_STATUS status;
+        struct libnetapi_ctx *ctx = NULL;
+        char *krb5_cc_env = NULL;
+
+        frame = talloc_stackframe();
+
+        ctx = talloc_zero(frame, struct libnetapi_ctx);
+        if (!ctx) {
+                TALLOC_FREE(frame);
+                return W_ERROR_V(WERR_NOMEM);
+        }
 
         BlockSignals(True, SIGPIPE);
@@ -133 +147 @@
 
 /****************************************************************
+ Return the static libnetapi context
 ****************************************************************/
 
@@ -146 +161 @@
 
 /****************************************************************
+ Free the static libnetapi context
 ****************************************************************/
 
@@ -182 +198 @@
 
 /****************************************************************
+ Override the current log level for libnetapi
 ****************************************************************/
 
@@ -187 +204 @@
                                         const char *debuglevel)
 {
-        AllowDebugChange = true;
         ctx->debuglevel = talloc_strdup(ctx, debuglevel);
-        if (!debug_parse_levels(debuglevel)) {
+        if (!lp_set_cmdline("log level", debuglevel)) {
                 return W_ERROR_V(WERR_GENERAL_FAILURE);
         }