Merge branch 'master' of ssh://git.samba.org/data/git/samba

[kai/samba.git] / source4 / utils / testparm.c

diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c
index 665c649e73c47e1bb3e4411fe2cde61a59055dd5..7f53eb5a528e0b9398453ae8416cc321b76662de 100644 (file)
--- a/source4/utils/testparm.c
+++ b/source4/utils/testparm.c
@@ -37,6 +37,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/socket/socket.h"
 #include "param/param.h"
+#include "param/loadparm.h"
 
 
 /***********************************************
@@ -93,8 +94,8 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
        for (s=0;s<lp_numservices(lp_ctx);s++) {
                struct loadparm_service *service = lp_servicebynum(lp_ctx, s);
                if (service != NULL) {
-                       const char **deny_list = lp_hostsdeny(service);
-                       const char **allow_list = lp_hostsallow(service);
+                       const char **deny_list = lp_hostsdeny(service, lp_default_service(lp_ctx));
+                       const char **allow_list = lp_hostsallow(service, lp_default_service(lp_ctx));
                        int i;
                        if(deny_list) {
                                for (i=0; deny_list[i]; i++) {
@@ -127,7 +128,7 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
                        fflush(stdout);
                        getc(stdin);
                }
-               if (section_name || parameter_name) {
+               if (section_name != NULL || parameter_name != NULL) {
                        struct loadparm_service *service = NULL;
                        if (!section_name) {
                                section_name = GLOBAL_NAME;
@@ -139,9 +140,9 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
                                        return(1);
                        }
                        if (!parameter_name) {
-                               lp_dump_one(stdout, show_defaults, service);
+                               lp_dump_one(stdout, show_defaults, service, lp_default_service(lp_ctx));
                        } else {
-                               ret = !lp_dump_a_parameter(lp_ctx, s, parameter_name, stdout, (service == NULL));
+                               ret = !lp_dump_a_parameter(lp_ctx, service, parameter_name, stdout);
                        }
                } else {
                        lp_dump(lp_ctx, stdout, show_defaults, lp_numservices(lp_ctx));
@@ -154,8 +155,8 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
                for (s=0;s<lp_numservices(lp_ctx);s++) {
                        struct loadparm_service *service = lp_servicebynum(lp_ctx, s);
                        if (service != NULL) {
-                               if (allow_access(NULL, lp_hostsdeny(NULL), lp_hostsallow(NULL), cname, caddr)
-                                   && allow_access(NULL, lp_hostsdeny(service), lp_hostsallow(service), cname, caddr)) {
+                               if (allow_access(NULL, lp_hostsdeny(NULL, lp_default_service(lp_ctx)), lp_hostsallow(NULL, lp_default_service(lp_ctx)), cname, caddr)
+                                   && allow_access(NULL, lp_hostsdeny(service, lp_default_service(lp_ctx)), lp_hostsallow(service, lp_default_service(lp_ctx)), cname, caddr)) {
                                        fprintf(stderr,"Allow connection from %s (%s) to %s\n",
                                                   cname,caddr,lp_servicename(service));
                                } else {
@@ -184,6 +185,7 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
        static const char *cname;
        static const char *caddr;
        static bool show_defaults = false;
+       struct loadparm_context *lp_ctx;
 
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -232,21 +234,23 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
                set_local_machine_name(new_local_machine, True);
        }
 */
+
+       lp_ctx = cmdline_lp_ctx;
        
        /* We need this to force the output */
-       lp_set_cmdline(global_loadparm, "log level", "2");
+       lp_set_cmdline(lp_ctx, "log level", "2");
 
-       fprintf(stderr, "Loaded smb config files from %s\n", lp_configfile(global_loadparm));
+       fprintf(stderr, "Loaded smb config files from %s\n", lp_configfile(lp_ctx));
 
-       if (!lp_load(lp_configfile(global_loadparm))) {
+       if (!lp_load(lp_ctx, lp_configfile(lp_ctx))) {
                fprintf(stderr,"Error loading services.\n");
                return(1);
        }
 
        fprintf(stderr,"Loaded services file OK.\n");
 
-       ret = do_global_checks(global_loadparm);
-       ret |= do_share_checks(global_loadparm, cname, caddr, silent_mode, show_defaults, section_name, parameter_name);
+       ret = do_global_checks(lp_ctx);
+       ret |= do_share_checks(lp_ctx, cname, caddr, silent_mode, show_defaults, section_name, parameter_name);
 
        return(ret);
 }