s3-ntlm_auth: use manage_gensec_request for squid-2.5-ntlmssp

[kai/samba.git] / source3 / utils / smbw_sample.c

diff --git a/source3/utils/smbw_sample.c b/source3/utils/smbw_sample.c
index d98d5cbe22edc8a2c76fd82952c14cb1b4db3252..2c4a20fab7b3794e47e9e2917626318787fa6a97 100644 (file)
--- a/source3/utils/smbw_sample.c
+++ b/source3/utils/smbw_sample.c
@@ -16,7 +16,7 @@ smbw_sample <options> path
      -l logfile
      -P prefix
      -d debuglevel
-     -U username%password
+     -U username%%password
      -R resolve order
 
 note that path must start with /smb/
@@ -32,8 +32,9 @@ int main(int argc, char *argv[])
        extern char *optarg;
        extern int optind;
        char *path;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       charset_initialise();
+       lp_load_global(get_dyn_CONFIGFILE());
        smbw_setup_shared();
 
        while ((opt = getopt(argc, argv, "W:U:R:d:P:l:hL:")) != EOF) {
@@ -51,7 +52,7 @@ int main(int argc, char *argv[])
                        smbw_setshared("DEBUG", optarg);
                        break;
                case 'U':
-                       p = strchr(optarg,'%');
+                       p = strchr_m(optarg,'%');
                        if (p) {
                                *p=0;
                                smbw_setshared("PASSWORD",p+1);
@@ -64,6 +65,7 @@ int main(int argc, char *argv[])
                case 'h':
                default:
                        usage();
+                       exit(1);
                }
        }
 
@@ -89,5 +91,6 @@ int main(int argc, char *argv[])
                printf("%s\n", dent->d_name);
        }
        smbw_closedir(dir);
+       TALLOC_FREE(frame);
        return 0;
 }