Fix for [homes] problem with security=share. We were still relying

on a valid vuid to get the connecting username - this is *never* true
(anymore) with security=share.
Jeremy.

1 files changed, 19 insertions, 5 deletions

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 01f9006a42a..1d3c2e144c3 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -3353,11 +3353,25 @@ int make_connection(char *service,char *user,char *password, int pwlen, char *de
       if (*user && Get_Pwnam(user,True))
 	return(make_connection(user,user,password,pwlen,dev,vuid));
 
-      if (validated_username(vuid))
-	{
-	  strcpy(user,validated_username(vuid));
-	  return(make_connection(user,user,password,pwlen,dev,vuid));
-	}
+      if(lp_security() != SEC_SHARE)
+      {
+        if (validated_username(vuid))
+        {
+          strcpy(user,validated_username(vuid));
+          return(make_connection(user,user,password,pwlen,dev,vuid));
+        }
+      }
+      else
+      {
+        /*
+         * Security = share. Try with sesssetup_user as the username.
+         */
+        if(*sesssetup_user)
+        {
+          strcpy(user,sesssetup_user);
+          return(make_connection(user,user,password,pwlen,dev,vuid));
+        }
+      }
     }
 
   if (!lp_snum_ok(snum) || !check_access(snum)) {