Merge from HEAD - don't base RID on a name being the lp_guest_account(), let

the actual passdb modules decide that.

Andrew Bartlett

diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index e13f0e9dfba91b31913d4053e594ba3ea877b66f..13e85bd21f62e5c612175f0638c70e989877366d 100644 (file)
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -826,8 +826,6 @@ DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
                
                if (pdb_getsampwnam(sam_user, pass->pw_name)) {
                        sid_copy(psid, pdb_get_user_sid(sam_user));
-               } else if (strcmp(pass->pw_name, lp_guestaccount()) == 0) {
-                       sid_append_rid(psid, DOMAIN_USER_RID_GUEST);
                } else {
                        sid_append_rid(psid, fallback_pdb_uid_to_user_rid(uid));
                }