diff options
| author | Herb Lewis <herb@samba.org> | 1998-02-26 20:41:05 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 1998-02-26 20:41:05 +0000 |
| commit | b3d9fe61f3085bb47fe8c0c31f51871824db3407 (patch) | |
| tree | e5c65c0473a13917d515330f3c9b221d0ce3dd8e | |
| parent | de3badf479eb08c19d4abc0625488effc79dc1fd (diff) | |
| download | samba-b3d9fe61f3085bb47fe8c0c31f51871824db3407.tar.gz samba-b3d9fe61f3085bb47fe8c0c31f51871824db3407.tar.bz2 samba-b3d9fe61f3085bb47fe8c0c31f51871824db3407.zip | |
-N option still prompted for password in smbclient -L usage
(This used to be commit 140fba461bc22f26055c13b04a084d2df16ac604)
| -rw-r--r-- | source3/client/client.c | 2 | ||||
| -rw-r--r-- | source3/client/clientutil.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 94518bee87..798dfe577e 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -40,6 +40,7 @@ extern pstring username; extern pstring workgroup; char *cmdstr=""; extern BOOL got_pass; +extern BOOL no_pass; extern BOOL connect_as_printer; extern BOOL connect_as_ipc; extern struct in_addr ipzero; @@ -3699,6 +3700,7 @@ static void usage(char *pname) break; case 'N': got_pass = True; + no_pass = True; break; case 'P': connect_as_printer = True; diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c index e2241be237..8d5e11e4d8 100644 --- a/source3/client/clientutil.c +++ b/source3/client/clientutil.c @@ -39,6 +39,7 @@ pstring smb_login_passwd = ""; pstring username=""; pstring workgroup=WORKGROUP; BOOL got_pass = False; +BOOL no_pass = False; BOOL connect_as_printer = False; BOOL connect_as_ipc = False; @@ -661,7 +662,8 @@ BOOL cli_send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setup, { got_pass = False; DEBUG(3,("resending login\n")); - goto get_pass; + if (! no_pass) + goto get_pass; } DEBUG(0,("Session setup failed for username=%s myname=%s destname=%s %s\n", |