This is like jht's (abortive) patch for showing only non-default testparm

options.

Andrew Bartlett
(This used to be commit 4cd822d9e4e5f35a47b0837bfa73c8a457e6cc85)

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 3086019467de3277cd4f8b5010d76a34bf7d2300..852472073b132ad82c2d0a40083379fa2840f662 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -171,7 +171,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
        return ret;
 }   
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
        extern char *optarg;
        extern int optind;
@@ -185,17 +185,19 @@ int main(int argc, char *argv[])
        static char *new_local_machine = NULL;
        const char *cname;
        const char *caddr;
+       static int show_defaults;
 
        struct poptOption long_options[] = {
                POPT_AUTOHELP
                {"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"},
                {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
                {0,0,0,0}
        };
 
-       pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 
-                                               POPT_CONTEXT_KEEP_FIRST);
+       pc = poptGetContext(NULL, argc, argv, long_options, 
+                           POPT_CONTEXT_KEEP_FIRST);
 
        while((opt = poptGetNextOpt(pc)) != -1);
 
@@ -276,7 +278,7 @@ int main(int argc, char *argv[])
                        fflush(stdout);
                        getc(stdin);
                }
-               lp_dump(stdout,True, lp_numservices());
+               lp_dump(stdout, show_defaults, lp_numservices());
        }
 
        if(cname && caddr){