merge from 2.2

1 files changed, 14 insertions, 3 deletions

diff --git a/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c
index 942c232ae81..1ef2995d71c 100644
--- a/source/passdb/pdb_smbpasswd.c
+++ b/source/passdb/pdb_smbpasswd.c
@@ -1297,6 +1297,7 @@ void pdb_endsampwent (void)
 BOOL pdb_getsampwent(SAM_ACCOUNT *user)
 {
 	struct smb_passwd *pw_buf=NULL;
+	BOOL done = False;
 
 	DEBUG(5,("pdb_getsampwent\n"));
 
@@ -1313,9 +1314,19 @@ BOOL pdb_getsampwent(SAM_ACCOUNT *user)
 	if (pw_buf == NULL) 
 		return False;
 
-	/* build the SAM_ACCOUNT entry from the smb_passwd struct. */
-	if (!build_sam_account(user, pw_buf))
-		return False;
+	while (!done)
+	{
+		/* do we have an entry? */
+		pw_buf = getsmbfilepwent(global_vp);
+		if (pw_buf == NULL) 
+			return False;
+
+		/* build the SAM_ACCOUNT entry from the smb_passwd struct. 
+		   We loop in case the user in the pdb does not exist in 
+		   the local system password file */
+		if (build_sam_account(user, pw_buf))
+			done = True;
+	}
 
 	DEBUG(5,("pdb_getsampwent:done\n"));