r23779: Change from v2 or later to v3 or later.

[gd/samba/.git] / source3 / utils / testparm.c

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index d30bd916b27cf8708ed518087a41494c1cc784b6..0027b8b043cee9f40ffe3b668f056b9279217bd5 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,


@@ -33,7 +33,6 @@
  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

-#include "smb.h"

 
 extern BOOL AllowDebugChange;
 
 
 extern BOOL AllowDebugChange;
 


@@ -48,32 +47,37 @@ static int do_global_checks(void)
        SMB_STRUCT_STAT st;
 
        if (lp_security() >= SEC_DOMAIN && !lp_encrypted_passwords()) {
        SMB_STRUCT_STAT st;
 
        if (lp_security() >= SEC_DOMAIN && !lp_encrypted_passwords()) {

-               printf("ERROR: in 'security=domain' mode the 'encrypt passwords' parameter must always be set to 'true'.\n");
+               fprintf(stderr, "ERROR: in 'security=domain' mode the 'encrypt passwords' parameter must always be set to 'true'.\n");

                ret = 1;
        }
 
        if (lp_wins_support() && lp_wins_server_list()) {
                ret = 1;
        }
 
        if (lp_wins_support() && lp_wins_server_list()) {

-               printf("ERROR: both 'wins support = true' and 'wins server = <server list>' \
+               fprintf(stderr, "ERROR: both 'wins support = true' and 'wins server = <server list>' \

 cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
                ret = 1;
        }
 
        if (!directory_exist(lp_lockdir(), &st)) {
 cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
                ret = 1;
        }
 
        if (!directory_exist(lp_lockdir(), &st)) {

-               printf("ERROR: lock directory %s does not exist\n",
+               fprintf(stderr, "ERROR: lock directory %s does not exist\n",

                       lp_lockdir());
                ret = 1;
        } else if ((st.st_mode & 0777) != 0755) {
                       lp_lockdir());
                ret = 1;
        } else if ((st.st_mode & 0777) != 0755) {

-               printf("WARNING: lock directory %s should have permissions 0755 for browsing to work\n",
+               fprintf(stderr, "WARNING: lock directory %s should have permissions 0755 for browsing to work\n",

                       lp_lockdir());
                ret = 1;
        }
 
        if (!directory_exist(lp_piddir(), &st)) {
                       lp_lockdir());
                ret = 1;
        }
 
        if (!directory_exist(lp_piddir(), &st)) {

-               printf("ERROR: pid directory %s does not exist\n",
+               fprintf(stderr, "ERROR: pid directory %s does not exist\n",

                       lp_piddir());
                ret = 1;
        }
 
                       lp_piddir());
                ret = 1;
        }
 

+       if (lp_passdb_expand_explicit()) {
+               fprintf(stderr, "WARNING: passdb expand explicit = yes is "
+                       "deprecated\n");
+       }
+

        /*
         * Password server sanity checks.
         */
        /*
         * Password server sanity checks.
         */


@@ -85,21 +89,12 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
                else if(lp_security() == SEC_DOMAIN)
                        pstrcpy(sec_setting, "domain");
 
                else if(lp_security() == SEC_DOMAIN)
                        pstrcpy(sec_setting, "domain");
 

-               printf("ERROR: The setting 'security=%s' requires the 'password server' parameter be set \
+               fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set \

 to a valid password server.\n", sec_setting );
                ret = 1;
        }
 
        
 to a valid password server.\n", sec_setting );
                ret = 1;
        }
 
        

-       /*
-        * Check 'hosts equiv' and 'use rhosts' compatibility with 'hostname lookup' value.
-        */
-
-       if(*lp_hosts_equiv() && !lp_hostname_lookups()) {
-               printf("ERROR: The setting 'hosts equiv = %s' requires that 'hostname lookups = yes'.\n", lp_hosts_equiv());
-               ret = 1;
-       }
-

        /*
         * Password chat sanity checks.
         */
        /*
         * Password chat sanity checks.
         */


@@ -115,7 +110,7 @@ to a valid password server.\n", sec_setting );
 #endif
 
                        if(lp_passwd_program() == NULL) {
 #endif
 
                        if(lp_passwd_program() == NULL) {

-                               printf("ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd program' \
+                               fprintf( stderr, "ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd program' \

 parameter.\n" );
                                ret = 1;
                        } else {
 parameter.\n" );
                                ret = 1;
                        } else {


@@ -129,20 +124,26 @@ parameter.\n" );
                                next_token(&p, truncated_prog, NULL, sizeof(pstring));
 
                                if(access(truncated_prog, F_OK) == -1) {
                                next_token(&p, truncated_prog, NULL, sizeof(pstring));
 
                                if(access(truncated_prog, F_OK) == -1) {

-                                       printf("ERROR: the 'unix password sync' parameter is set and the 'passwd program' (%s) \
+                                       fprintf(stderr, "ERROR: the 'unix password sync' parameter is set and the 'passwd program' (%s) \

 cannot be executed (error was %s).\n", truncated_prog, strerror(errno) );
                                        ret = 1;
                                }
 cannot be executed (error was %s).\n", truncated_prog, strerror(errno) );
                                        ret = 1;
                                }

-                       }
+
+             }

 
 #ifdef WITH_PAM
                }
 #endif
 
                if(lp_passwd_chat() == NULL) {
 
 #ifdef WITH_PAM
                }
 #endif
 
                if(lp_passwd_chat() == NULL) {

-                       printf("ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd chat' \
+                       fprintf(stderr, "ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd chat' \

 parameter.\n");
                        ret = 1;
 parameter.\n");
                        ret = 1;

+               } else 
+               /* check if there's a %u parameter present */
+               if(strstr_m(lp_passwd_program(), "%u") == NULL) {
+                       fprintf(stderr, "ERROR: the 'passwd program' (%s) requires a '%%u' parameter.\n", lp_passwd_program());
+                       ret = 1;

                }
 
                /*
                }
 
                /*


@@ -151,8 +152,8 @@ parameter.\n");
                 */
 
                if(lp_encrypted_passwords()) {
                 */
 
                if(lp_encrypted_passwords()) {

-                       if(strstr( lp_passwd_chat(), "%o")!=NULL) {
-                               printf("ERROR: the 'passwd chat' script [%s] expects to use the old plaintext password \
+                       if(strstr_m( lp_passwd_chat(), "%o")!=NULL) {
+                               fprintf(stderr, "ERROR: the 'passwd chat' script [%s] expects to use the old plaintext password \

 via the %%o substitution. With encrypted passwords this is not possible.\n", lp_passwd_chat() );
                                ret = 1;
                        }
 via the %%o substitution. With encrypted passwords this is not possible.\n", lp_passwd_chat() );
                                ret = 1;
                        }


@@ -160,38 +161,48 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
        }
 
        if (strlen(lp_winbind_separator()) != 1) {
        }
 
        if (strlen(lp_winbind_separator()) != 1) {

-               printf("ERROR: the 'winbind separator' parameter must be a single character.\n");
+               fprintf(stderr,"ERROR: the 'winbind separator' parameter must be a single character.\n");

                ret = 1;
        }
 
        if (*lp_winbind_separator() == '+') {
                ret = 1;
        }
 
        if (*lp_winbind_separator() == '+') {

-               printf("'winbind separator = +' might cause problems with group membership.\n");
+               fprintf(stderr,"'winbind separator = +' might cause problems with group membership.\n");

        }
 
        if (lp_algorithmic_rid_base() < BASE_RID) {
                /* Try to prevent admin foot-shooting, we can't put algorithmic
                   rids below 1000, that's the 'well known RIDs' on NT */
        }
 
        if (lp_algorithmic_rid_base() < BASE_RID) {
                /* Try to prevent admin foot-shooting, we can't put algorithmic
                   rids below 1000, that's the 'well known RIDs' on NT */

-               printf("'algorithmic rid base' must be equal to or above %lu\n", BASE_RID);
+               fprintf(stderr,"'algorithmic rid base' must be equal to or above %lu\n", BASE_RID);

        }
 
        if (lp_algorithmic_rid_base() & 1) {
        }
 
        if (lp_algorithmic_rid_base() & 1) {

-               printf("'algorithmic rid base' must be even.\n");
+               fprintf(stderr,"'algorithmic rid base' must be even.\n");
+       }
+
+#ifndef HAVE_DLOPEN
+       if (lp_preload_modules()) {
+               fprintf(stderr,"WARNING: 'preload modules = ' set while loading plugins not supported.\n");
+       }
+#endif
+
+       if (!lp_passdb_backend()) {
+               fprintf(stderr,"ERROR: passdb backend must have a value or be left out\n");

        }
 
        return ret;
 }   
 
        }
 
        return ret;
 }   
 

-int main(int argc, const char *argv[])
+ int main(int argc, const char *argv[])

 {
 {

-       extern char *optarg;
-       extern int optind;

        const char *config_file = dyn_CONFIGFILE;
        int s;
        static BOOL silent_mode = False;
        const char *config_file = dyn_CONFIGFILE;
        int s;
        static BOOL silent_mode = False;

+       static BOOL show_all_parameters = False;

        int ret = 0;
        int ret = 0;

-       int opt;

        poptContext pc;
        poptContext pc;

-       static char *term_code = "";
+       static const char *term_code = "";
+       static char *parameter_name = NULL;
+       static const char *section_name = NULL;

        static char *new_local_machine = NULL;
        const char *cname;
        const char *caddr;
        static char *new_local_machine = NULL;
        const char *cname;
        const char *caddr;


@@ -203,14 +214,25 @@ int main(int argc, const char *argv[])
                {"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"},
                {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
                {"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"},
                {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},

-               {0,0,0,0}
+               {"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
+               {"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },
+               {"section-name", '\0', POPT_ARG_STRING, &section_name, 0, "Limit testparm to a named section" },
+               POPT_COMMON_VERSION
+               POPT_TABLEEND

        };
 
        };
 

+       load_case_tables();
+

        pc = poptGetContext(NULL, argc, argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
        poptSetOtherOptionHelp(pc, "[OPTION...] <config-file> [host-name] [host-ip]");
 
        pc = poptGetContext(NULL, argc, argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
        poptSetOtherOptionHelp(pc, "[OPTION...] <config-file> [host-name] [host-ip]");
 

-       while((opt = poptGetNextOpt(pc)) != -1);
+       while(poptGetNextOpt(pc) != -1);
+
+       if (show_all_parameters) {
+               show_parameter_list();
+               exit(0);
+       }

 
        setup_logging(poptGetArg(pc), True);
 
 
        setup_logging(poptGetArg(pc), True);
 


@@ -219,31 +241,37 @@ int main(int argc, const char *argv[])
 
        cname = poptGetArg(pc);
        caddr = poptGetArg(pc);
 
        cname = poptGetArg(pc);
        caddr = poptGetArg(pc);

-       
+
+       if ( cname && ! caddr ) {
+               printf ( "ERROR: You must specify both a machine name and an IP address.\n" );
+               return(1);
+       }
+

        if (new_local_machine) {
        if (new_local_machine) {

-               set_local_machine_name(new_local_machine);
+               set_local_machine_name(new_local_machine, True);

        }
 
        }
 

-       dbf = x_stdout;
+       dbf = x_stderr;

        DEBUGLEVEL = 2;
        AllowDebugChange = False;
 
        DEBUGLEVEL = 2;
        AllowDebugChange = False;
 

-       printf("Load smb config files from %s\n",config_file);
+       fprintf(stderr,"Load smb config files from %s\n",config_file);

 
 

-       if (!lp_load(config_file,False,True,False)) {
-               printf("Error loading services.\n");
+       if (!lp_load(config_file,False,True,False,True)) {
+               fprintf(stderr,"Error loading services.\n");

                return(1);
        }
 
                return(1);
        }
 

-       printf("Loaded services file OK.\n");
+       fprintf(stderr,"Loaded services file OK.\n");

 
        ret = do_global_checks();
 
        for (s=0;s<1000;s++) {
                if (VALID_SNUM(s))
 
        ret = do_global_checks();
 
        for (s=0;s<1000;s++) {
                if (VALID_SNUM(s))

-                       if (strlen(lp_servicename(s)) > 8) {
-                               printf("WARNING: You have some share names that are longer than 8 chars\n");
-                               printf("These may give errors while browsing or may not be accessible\nto some older clients\n");
+                       if (strlen(lp_servicename(s)) > 12) {
+                               fprintf(stderr, "WARNING: You have some share names that are longer than 12 characters.\n" );
+                               fprintf(stderr, "These may not be accessible to some older clients.\n" );
+                               fprintf(stderr, "(Eg. Windows9x, WindowsMe, and smbclient prior to Samba 3.0.)\n" );

                                break;
                        }
        }
                                break;
                        }
        }


@@ -258,7 +286,7 @@ int main(int argc, const char *argv[])
                                        char *hasstar = strchr_m(deny_list[i], '*');
                                        char *hasquery = strchr_m(deny_list[i], '?');
                                        if(hasstar || hasquery) {
                                        char *hasstar = strchr_m(deny_list[i], '*');
                                        char *hasquery = strchr_m(deny_list[i], '?');
                                        if(hasstar || hasquery) {

-                                               printf("Invalid character %c in hosts deny list (%s) for service %s.\n",
+                                               fprintf(stderr,"Invalid character %c in hosts deny list (%s) for service %s.\n",

                                                           hasstar ? *hasstar : *hasquery, deny_list[i], lp_servicename(s) );
                                        }
                                }
                                                           hasstar ? *hasstar : *hasquery, deny_list[i], lp_servicename(s) );
                                        }
                                }


@@ -269,38 +297,100 @@ int main(int argc, const char *argv[])
                                        char *hasstar = strchr_m(allow_list[i], '*');
                                        char *hasquery = strchr_m(allow_list[i], '?');
                                        if(hasstar || hasquery) {
                                        char *hasstar = strchr_m(allow_list[i], '*');
                                        char *hasquery = strchr_m(allow_list[i], '?');
                                        if(hasstar || hasquery) {

-                                               printf("Invalid character %c in hosts allow list (%s) for service %s.\n",
+                                               fprintf(stderr,"Invalid character %c in hosts allow list (%s) for service %s.\n",

                                                           hasstar ? *hasstar : *hasquery, allow_list[i], lp_servicename(s) );
                                        }
                                }
                        }
 
                        if(lp_level2_oplocks(s) && !lp_oplocks(s)) {
                                                           hasstar ? *hasstar : *hasquery, allow_list[i], lp_servicename(s) );
                                        }
                                }
                        }
 
                        if(lp_level2_oplocks(s) && !lp_oplocks(s)) {

-                               printf("Invalid combination of parameters for service %s. \
+                               fprintf(stderr,"Invalid combination of parameters for service %s. \

                                           Level II oplocks can only be set if oplocks are also set.\n",
                                           lp_servicename(s) );
                        }
                                           Level II oplocks can only be set if oplocks are also set.\n",
                                           lp_servicename(s) );
                        }

+
+                       if (lp_map_hidden(s) && !(lp_create_mask(s) & S_IXOTH)) {
+                               fprintf(stderr,"Invalid combination of parameters for service %s. \
+                                          Map hidden can only work if create mask includes octal 01 (S_IXOTH).\n",
+                                          lp_servicename(s) );
+                       }
+                       if (lp_map_hidden(s) && (lp_force_create_mode(s) & S_IXOTH)) {
+                               fprintf(stderr,"Invalid combination of parameters for service %s. \
+                                          Map hidden can only work if force create mode excludes octal 01 (S_IXOTH).\n",
+                                          lp_servicename(s) );
+                       }
+                       if (lp_map_system(s) && !(lp_create_mask(s) & S_IXGRP)) {
+                               fprintf(stderr,"Invalid combination of parameters for service %s. \
+                                          Map system can only work if create mask includes octal 010 (S_IXGRP).\n",
+                                          lp_servicename(s) );
+                       }
+                       if (lp_map_system(s) && (lp_force_create_mode(s) & S_IXGRP)) {
+                               fprintf(stderr,"Invalid combination of parameters for service %s. \
+                                          Map system can only work if force create mode excludes octal 010 (S_IXGRP).\n",
+                                          lp_servicename(s) );
+                       }
+#ifdef HAVE_CUPS
+                       if (lp_printing(s) == PRINT_CUPS && *(lp_printcommand(s)) != '\0') {
+                                fprintf(stderr,"Warning: Service %s defines a print command, but \
+print command parameter is ignored when using CUPS libraries.\n",
+                                          lp_servicename(s) );
+                       }
+#endif

                }
        }
 
                }
        }
 

+
+       if (!section_name && !parameter_name) {
+               fprintf(stderr,"Server role: %s\n", server_role_str(lp_server_role()));
+       }
+

        if (!cname) {
                if (!silent_mode) {
        if (!cname) {
                if (!silent_mode) {

-                       printf("Press enter to see a dump of your service definitions\n");
+                       fprintf(stderr,"Press enter to see a dump of your service definitions\n");

                        fflush(stdout);
                        getc(stdin);
                }
                        fflush(stdout);
                        getc(stdin);
                }

+               if (parameter_name || section_name) {
+                       BOOL isGlobal = False;
+                       s = GLOBAL_SECTION_SNUM;
+
+                       if (!section_name) {
+                               section_name = GLOBAL_NAME;
+                               isGlobal = True;
+                       } else if ((isGlobal=!strwicmp(section_name, GLOBAL_NAME)) == 0 &&
+                                (s=lp_servicenumber(section_name)) == -1) {
+                                       fprintf(stderr,"Unknown section %s\n",
+                                               section_name);
+                                       return(1);
+                       }
+                       if (parameter_name) {
+                               if (!dump_a_parameter( s, parameter_name, stdout, isGlobal)) {
+                                       fprintf(stderr,"Parameter %s unknown for section %s\n",
+                                               parameter_name, section_name);
+                                       return(1);
+                               }
+                       } else {
+                               if (isGlobal == True)
+                                       lp_dump(stdout, show_defaults, 0);
+                               else
+                                       lp_dump_one(stdout, show_defaults, s);
+                       }
+                       return(ret);
+               }
+

                lp_dump(stdout, show_defaults, lp_numservices());
        }
 
        if(cname && caddr){
                /* this is totally ugly, a real `quick' hack */
                for (s=0;s<1000;s++) {
                lp_dump(stdout, show_defaults, lp_numservices());
        }
 
        if(cname && caddr){
                /* this is totally ugly, a real `quick' hack */
                for (s=0;s<1000;s++) {

-                       if (VALID_SNUM(s)) {             
-                               if (allow_access(lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) {
-                                       printf("Allow connection from %s (%s) to %s\n",
+                       if (VALID_SNUM(s)) {
+                               if (allow_access(lp_hostsdeny(-1), lp_hostsallow(-1), cname, caddr)
+                                   && allow_access(lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) {
+                                       fprintf(stderr,"Allow connection from %s (%s) to %s\n",

                                                   cname,caddr,lp_servicename(s));
                                } else {
                                                   cname,caddr,lp_servicename(s));
                                } else {

-                                       printf("Deny connection from %s (%s) to %s\n",
+                                       fprintf(stderr,"Deny connection from %s (%s) to %s\n",

                                                   cname,caddr,lp_servicename(s));
                                }
                        }
                                                   cname,caddr,lp_servicename(s));
                                }
                        }


@@ -308,3 +398,4 @@ int main(int argc, const char *argv[])
        }
        return(ret);
 }
        }
        return(ret);
 }

+