r91: Fix lsalookupnames. Previously we'd fail if we didn't find the name, but

we never checked if it was a domain user and didn't find a local one.

diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c
index 50bbb4c72c61348f7e3457320035017a1aa8ac19..e317f8f84e2f1b8756b039d8434ee48516779c4c 100644 (file)
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -201,6 +201,13 @@ void split_domain_name(const char *fullname, char *domain, char *name)
                fstrcpy(domain, full_name);
                fstrcpy(name, p+1);
        } else {
+               if(!lp_domain_logons()) {
+                       fstrcpy(domain, global_myname());
+                       fstrcpy(name, full_name);
+               } else {
+                       fstrcpy(domain, lp_workgroup());
+                       fstrcpy(name, full_name);
+               }
                fstrcpy(domain, global_myname());
                fstrcpy(name, full_name);
        }

diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 07c024e1ca98f913f50b9a52cc62f9be71879a37..9801ce47f8fab2a7c16d2c3f947c33c031fb5264 100644 (file)
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -165,6 +165,12 @@ static void init_lsa_rid2s(DOM_R_REF *ref, DOM_RID2 *rid2,
 
                status = lookup_name(dom_name, user, &sid, &name_type);
 
+               if((name_type == SID_NAME_UNKNOWN) && (lp_server_role() == ROLE_DOMAIN_MEMBER)  && (strncmp(dom_name, full_name, strlen(dom_name)) != 0)) {
+                       DEBUG(5, ("init_lsa_rid2s: domain name not provided and local account not found, using member domain\n"));
+                       fstrcpy(dom_name, lp_workgroup());
+                       status = lookup_name(dom_name, user, &sid, &name_type);
+               }
+
                DEBUG(5, ("init_lsa_rid2s: %s\n", status ? "found" : 
                          "not found"));