From bd8aaf213b8ddcec89b0736f0c3c61b8e1a6d87e Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 18 Aug 2010 13:13:39 -0400
Subject: [PATCH] --- yaml --- r: 210000 b: refs/heads/master c:
 fc87a40677bbe0937e2ff0642c7e83c9a4813f3d h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7785537cd87..2ba5d7903e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 232341ba7fa15115d40f6aa0f8dd14e96e3ad375
+refs/heads/master: fc87a40677bbe0937e2ff0642c7e83c9a4813f3d
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 95c2ea67edfb..446e2486d5f0 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1673,7 +1673,8 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
 				    MAX_USERNAME_SIZE))
 				continue;
 			if (strlen(vol->username) != 0 &&
-			    strncmp(ses->password, vol->password,
+			    strncmp(ses->password,
+				    vol->password ? vol->password : "",
 				    MAX_PASSWORD_SIZE))
 				continue;
 		}