Changeset 745 for trunk/server/source3/lib/popt_common.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/popt_common.c (modified) (5 diffs)

trunk/server/source3/lib/popt_common.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
 
 /* Handle command line options:
@@ -34 +36 @@
  */
 
-extern bool AllowDebugChange;
+enum {OPT_OPTION=1};
+
 extern bool override_logfile;
 
@@ -96 +99 @@
 
         switch(opt->val) {
+        case OPT_OPTION:
+                if (!lp_set_option(arg)) {
+                        fprintf(stderr, "Error setting option '%s'\n", arg);
+                        exit(1);
+                }
+                break;
+
         case 'd':
                 if (arg) {
-                        debug_parse_levels(arg);
-                        AllowDebugChange = False;
+                        lp_set_cmdline("log level", arg);
                 }
                 break;
@@ -164 +173 @@
         { "log-basename", 'l', POPT_ARG_STRING, NULL, 'l', "Base name for log files", "LOGFILEBASE" },
         { "version", 'V', POPT_ARG_NONE, NULL, 'V', "Print version" },
+        { "option",         0, POPT_ARG_STRING, NULL, OPT_OPTION, "Set smb.conf option from command line", "name=value" },
         POPT_TABLEEND
 };
@@ -185 +195 @@
 };
 
+struct poptOption popt_common_option[] = {
+        { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_POST, (void *)popt_common_callback },
+        { "option",         0, POPT_ARG_STRING, NULL, OPT_OPTION, "Set smb.conf option from command line", "name=value" },
+        POPT_TABLEEND
+};
 
 /* Handle command line options: