Changeset 740 for vendor/current/source3/utils/testparm.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/testparm.c (modified) (10 diffs)

vendor/current/source3/utils/testparm.c

@@ -33 +33 @@
 
 #include "includes.h"
-
-extern bool AllowDebugChange;
+#include "system/filesys.h"
+#include "popt_common.h"
 
 /*******************************************************************
@@ -78 +78 @@
         }
 
+        if (strequal(lp_workgroup(), global_myname())) {
+                fprintf(stderr, "WARNING: 'workgroup' and 'netbios name' " \
+                        "must differ.\n");
+                ret = 1;
+        }
+
         if (!directory_exist_stat(lp_lockdir(), &st)) {
                 fprintf(stderr, "ERROR: lock directory %s does not exist\n",
@@ -123 +129 @@
          */
 
-        if((lp_security() == SEC_SERVER || lp_security() >= SEC_DOMAIN) && !lp_passwordserver()) {
+        if((lp_security() == SEC_SERVER || lp_security() >= SEC_DOMAIN) && !*lp_passwordserver()) {
                 const char *sec_setting;
                 if(lp_security() == SEC_SERVER)
@@ -129 +135 @@
                 else if(lp_security() == SEC_DOMAIN)
                         sec_setting = "domain";
+                else if(lp_security() == SEC_ADS)
+                        sec_setting = "ads";
                 else
                         sec_setting = "";
 
-                fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set \
-to a valid password server.\n", sec_setting );
-                ret = 1;
+                fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set\n"
+                        "to the default value * or a valid password server.\n", sec_setting );
+                ret = 1;
+        }
+
+        if((lp_security() >= SEC_DOMAIN) && (strcmp(lp_passwordserver(), "*") != 0)) {
+                const char *sec_setting;
+                if(lp_security() == SEC_DOMAIN)
+                        sec_setting = "domain";
+                else if(lp_security() == SEC_ADS)
+                        sec_setting = "ads";
+                else
+                        sec_setting = "";
+
+                fprintf(stderr, "WARNING: The setting 'security=%s' should NOT be combined with the 'password server' parameter.\n"
+                        "(by default Samba will discover the correct DC to contact automatically).\n", sec_setting );
         }
 
@@ -320 +341 @@
         static char *parameter_name = NULL;
         static const char *section_name = NULL;
-        static char *new_local_machine = NULL;
         const char *cname;
         const char *caddr;
@@ -330 +350 @@
                 {"suppress-prompt", 's', POPT_ARG_VAL, &silent_mode, 1, "Suppress prompt for enter"},
                 {"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
-                {"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
                 {"skip-logic-checks", 'l', POPT_ARG_NONE, &skip_logic_checks, 1, "Skip the global checks"},
                 {"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
@@ -337 +356 @@
                 POPT_COMMON_VERSION
                 POPT_COMMON_DEBUGLEVEL
+                POPT_COMMON_OPTION
                 POPT_TABLEEND
         };
@@ -348 +368 @@
          * not by smb.conf.
          */
-        DEBUGLEVEL_CLASS[DBGC_ALL] = 2;
+        lp_set_cmdline("log level", "2");
 
         pc = poptGetContext(NULL, argc, argv, long_options, 
@@ -361 +381 @@
         }
 
-        setup_logging(poptGetArg(pc), True);
+        setup_logging(poptGetArg(pc), DEBUG_STDERR);
 
         if (poptPeekArg(pc)) 
@@ -376 +396 @@
                 goto done;
         }
-
-        if (new_local_machine) {
-                set_local_machine_name(new_local_machine, True);
-        }
-
-        dbf = x_stderr;
-        /* Don't let the debuglevel be changed by smb.conf. */
-        AllowDebugChange = False;
 
         fprintf(stderr,"Load smb config files from %s\n",config_file);