1 files changed, 6 insertions, 0 deletions
diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c
index 000cbba1a7..b4f0849c5f 100644
--- a/source3/client/clientutil.c
+++ b/source3/client/clientutil.c
@@ -428,6 +428,12 @@ BOOL cli_send_login(char *inbuf, char *outbuf, BOOL start_session, BOOL use_setu
   else
     pass = (char *)getpass("Password: ");
 
+  if(pass == NULL)
+  {
+    DEBUG(0, ("cli_send_login : no password available - logon failed.\n"));
+    return False;
+  }
+
   if (Protocol >= PROTOCOL_LANMAN1 && use_setup)
     {
       fstring pword;