Merge commit 'release-4-0-0alpha1' into v4-0-test

[kai/samba.git] / source / torture / masktest.c

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index d76a205f7c3ab19739d5c542ecab3d44277f9f79..fec7657afea1da7b7f9c309c673931546cdcd6db 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -5,7 +5,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
-   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,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,10 +26,12 @@
 #include "pstring.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
+#include "param/param.h"
+#include "dynconfig.h"
 
 static struct cli_credentials *credentials;
-static BOOL showall = False;
-static BOOL old_list = False;
+static bool showall = false;
+static bool old_list = false;
 static const char *maskchars = "<>\"?*abc.";
 static const char *filechars = "abcdefghijklm.";
 static int verbose;
@@ -38,12 +39,12 @@ static int die_on_error;
 static int NumLoops = 0;
 static int max_length = 20;
 
-static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
+static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
 {
        /* oh what a weird world this is */
-       if (old_list && strcmp(pattern, "*.*") == 0) return True;
+       if (old_list && strcmp(pattern, "*.*") == 0) return true;
 
-       if (ISDOT(pattern)) return False;
+       if (ISDOT(pattern)) return false;
 
        if (ISDOTDOT(file)) file = ".";
 
@@ -99,7 +100,7 @@ static struct {
        pstring long_name;
        pstring short_name;
 } last_hit;
-static BOOL f_info_hit;
+static bool f_info_hit;
 
 static void listfn(struct clilist_file_info *f, const char *s, void *state)
 {
@@ -112,7 +113,7 @@ static void listfn(struct clilist_file_info *f, const char *s, void *state)
        }
        pstrcpy(last_hit.long_name, f->name);
        pstrcpy(last_hit.short_name, f->short_name);
-       f_info_hit = True;
+       f_info_hit = true;
 }
 
 static void get_real_name(struct smbcli_state *cli, 
@@ -125,7 +126,7 @@ static void get_real_name(struct smbcli_state *cli,
                mask = "\\masktest\\*";
        }
 
-       f_info_hit = False;
+       f_info_hit = false;
 
        smbcli_list_new(cli->tree, mask, 
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, 
@@ -285,7 +286,7 @@ static void usage(void)
 
        setup_logging("masktest", DEBUG_STDOUT);
 
-       lp_set_cmdline("log level", "0");
+       lp_set_cmdline(global_loadparm, "log level", "0");
 
        if (argc < 2 || argv[1][0] == '-') {
                usage();
@@ -301,7 +302,7 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load();
+       lp_load(dyn_CONFIGFILE);
 
        credentials = cli_credentials_init(talloc_autofree_context());
        cli_credentials_guess(credentials);
@@ -325,7 +326,7 @@ static void usage(void)
                        verbose++;
                        break;
                case 'M':
-                       lp_set_cmdline("max protocol", optarg);
+                       lp_set_cmdline(global_loadparm, "max protocol", optarg);
                        break;
                case 'U':
                        cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED);
@@ -349,7 +350,7 @@ static void usage(void)
                        showall = 1;
                        break;
                case 'o':
-                       old_list = True;
+                       old_list = true;
                        break;
                default:
                        printf("Unknown option %c (%d)\n", (char)opt, opt);