diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 03:28:37 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 03:28:37 +0000 |
| commit | 630944d179bd3b1ff877b9c52c00c3f452a2e9cf (patch) | |
| tree | 1adaab9002c0faa2dbcbd2766a26614517b9c7f0 /source3/torture/torture.c | |
| parent | a9ae0df3332270cc66cd9167564ff9ee93f23f44 (diff) | |
| download | samba-630944d179bd3b1ff877b9c52c00c3f452a2e9cf.tar.gz samba-630944d179bd3b1ff877b9c52c00c3f452a2e9cf.tar.xz samba-630944d179bd3b1ff877b9c52c00c3f452a2e9cf.zip | |
Cleint-side-auth/kerberos fixes from HEAD, and don't connect to a share
twice, let the libsmb code determine what form the share name should take.
Andrew Bartlett
(This used to be commit a25f6126647c94551c03bfc28e3fb5ec5ef6264a)
Diffstat (limited to 'source3/torture/torture.c')
| -rw-r--r-- | source3/torture/torture.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 5466d8ef9e..3fd0d7aa66 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -4018,6 +4018,7 @@ static void usage(void) { int opt, i; char *p; + int gotuser = 0; int gotpass = 0; extern char *optarg; extern int optind; @@ -4103,13 +4104,13 @@ static void usage(void) case 'k': #ifdef HAVE_KRB5 use_kerberos = True; - gotpass = True; #else d_printf("No kerberos support compiled in\n"); exit(1); #endif break; case 'U': + gotuser = 1; fstrcpy(username,optarg); p = strchr_m(username,'%'); if (p) { @@ -4124,6 +4125,7 @@ static void usage(void) } } + if(use_kerberos && !gotuser) gotpass = True; while (!gotpass) { p = getpass("Password:"); |