From b3d9fe61f3085bb47fe8c0c31f51871824db3407 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Thu, 26 Feb 1998 20:41:05 +0000
Subject: -N option still prompted for password in smbclient -L usage (This
 used to be commit 140fba461bc22f26055c13b04a084d2df16ac604)

---
 source3/client/client.c     | 2 ++
 source3/client/clientutil.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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",
-- 
cgit