Changeset 740 for vendor/current/source3/utils/net.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/utils/net.c (modified) (13 diffs)

vendor/current/source3/utils/net.c

@@ -42 +42 @@
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
-
-extern bool AllowDebugChange;
+#include "secrets.h"
+#include "lib/netapi/netapi.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
+#include "messages.h"
 
 #ifdef WITH_FAKE_KASERVER
@@ -232 +236 @@
 static int net_getlocalsid(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
         const char *name;
         fstring sid_str;
@@ -272 +276 @@
 static int net_setlocalsid(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
 
         if ( (argc != 1)
@@ -293 +297 @@
 static int net_setdomainsid(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
 
         if ( (argc != 1)
@@ -314 +318 @@
 static int net_getdomainsid(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID domain_sid;
+        struct dom_sid domain_sid;
         fstring sid_str;
 
@@ -668 +672 @@
                 net_maxrid,
                 NET_TRANSPORT_LOCAL,
-                N_("Display the maximul RID currently used"),
+                N_("Display the maximum RID currently used"),
                 N_("  net maxrid")
         },
@@ -719 +723 @@
                 N_("  Use 'net help eventlog' to get more information about "
                    "'net eventlog' commands.")
+        },
+        {       "printing",
+                net_printing,
+                NET_TRANSPORT_LOCAL,
+                N_("Process tdb printer files"),
+                N_("  Use 'net help printing' to get more information about "
+                   "'net printing' commands.")
+        },
+
+        {       "serverid",
+                net_serverid,
+                NET_TRANSPORT_LOCAL,
+                N_("Manage the serverid tdb"),
+                N_("  Use 'net help serverid' to get more information about "
+                   "'net serverid' commands.")
         },
 
@@ -797 +816 @@
                 {"single-obj-repl", 0, POPT_ARG_NONE, &c->opt_single_obj_repl},
                 {"clean-old-entries", 0, POPT_ARG_NONE, &c->opt_clean_old_entries},
-
+                /* Options for 'net idmap'*/
+                {"db", 0, POPT_ARG_STRING, &c->opt_db},
+                {"lock", 0, POPT_ARG_NONE,   &c->opt_lock},
+                {"auto", 'a', POPT_ARG_NONE,   &c->opt_auto},
+                {"repair", 0, POPT_ARG_NONE,   &c->opt_repair},
                 POPT_COMMON_SAMBA
                 { 0, 0, 0, 0}
@@ -804 +827 @@
         zero_sockaddr(&c->opt_dest_ip);
 
+        setup_logging(argv[0], DEBUG_STDERR);
+
         load_case_tables();
 
         setlocale(LC_ALL, "");
 #if defined(HAVE_BINDTEXTDOMAIN)
-        bindtextdomain(MODULE_NAME, dyn_LOCALEDIR);
+        bindtextdomain(MODULE_NAME, get_dyn_LOCALEDIR());
 #endif
 #if defined(HAVE_TEXTDOMAIN)
@@ -815 +840 @@
 
         /* set default debug level to 0 regardless of what smb.conf sets */
-        DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
-        dbf = x_stderr;
+        lp_set_cmdline("log level", "0");
         c->private_data = net_func;
 
@@ -855 +879 @@
         }
 
-        /*
-         * Don't load debug level from smb.conf. It should be
-         * set by cmdline arg or remain default (0)
-         */
-        AllowDebugChange = false;
         lp_load(get_dyn_CONFIGFILE(), true, false, false, true);
 
@@ -898 +917 @@
 
         /* this makes sure that when we do things like call scripts,
-           that it won't assert becouse we are not root */
+           that it won't assert because we are not root */
         sec_init();
 
@@ -912 +931 @@
         }
 
+        /* Failing to init the msg_ctx isn't a fatal error. Only
+           root-level things (joining/leaving domains etc.) will be denied. */
+
+        c->msg_ctx = messaging_init(c, procid_self(),
+                                    event_context_init(c));
+
         rc = net_run_function(c, argc_new-1, argv_new+1, "net", net_func);