diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 03:06:45 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 03:06:45 +0000 |
| commit | 52db4c66986d880cde5c0f7df7b6a017a04ba10c (patch) | |
| tree | b232b5c49099a71df133c0082c9359973f13bd9c /source3/torture | |
| parent | 98410be6074362acdd3c1799a59602f590c9decb (diff) | |
| download | samba-52db4c66986d880cde5c0f7df7b6a017a04ba10c.tar.gz samba-52db4c66986d880cde5c0f7df7b6a017a04ba10c.tar.bz2 samba-52db4c66986d880cde5c0f7df7b6a017a04ba10c.zip | |
Missed a couple of files from the client-side kerberos merge
(This used to be commit 56934f303c0551df858cc6d6ad32d0b37fcd1307)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/locktest.c | 5 | ||||
| -rw-r--r-- | source3/torture/masktest.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 5f9a63802b..63b9590dd6 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -24,6 +24,7 @@ static fstring password[2]; static fstring username[2]; +static int got_user; static int got_pass; static BOOL use_kerberos; static int numops = 1000; @@ -602,13 +603,13 @@ static void usage(void) case 'k': #ifdef HAVE_KRB5 use_kerberos = True; - got_pass = True; #else d_printf("No kerberos support compiled in\n"); exit(1); #endif break; case 'U': + got_user = 1; if (got_pass == 2) { d_printf("Max of 2 usernames\n"); exit(1); @@ -663,6 +664,8 @@ static void usage(void) } } + if(use_kerberos && !got_user) got_pass = True; + argc -= optind; argv += optind; diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c index df0a047aff..7d751fb789 100644 --- a/source3/torture/masktest.c +++ b/source3/torture/masktest.c @@ -254,7 +254,7 @@ struct cli_state *connect_one(char *share) static char *resultp; static file_info *f_info; -void listfn(file_info *f, const char *s, void *state) +static void listfn(file_info *f, const char *s, void *state) { if (strcmp(f->name,".") == 0) { resultp[0] = '+'; |