r17967: Somewhere along the line we lost unixName here, and so lost the

ability for 'administrator' to log in as unix user 'root'.

Andrew Bartlett
(This used to be commit 221efba5289b8bbb54b770c556f19bfbdc9ee216)

diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c
index 70bf8f0ecb80d8890c70e1ab422c315c4ca2e302..73bfde27949d88972c491173771603ab76df248c 100644 (file)
--- a/source4/dsdb/common/sidmap.c
+++ b/source4/dsdb/common/sidmap.c
@@ -126,7 +126,7 @@ _PUBLIC_ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap,
                                        struct dom_sid *sid, uid_t *uid)
 {
        const char *attrs[] = { "sAMAccountName", "uidNumber", 
-                               "sAMAccountType", NULL };
+                               "sAMAccountType", "unixName", NULL };
        int ret;
        const char *s;
        TALLOC_CTX *tmp_ctx;