Remove expanding sids from smbd, this will be done in winbindd.

Volker

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 871b399b86dcb1eaeed7af58b910dd1cf03c9681..b21b00ca8d80823709e731b7ecb2a3f1f882a0d8 100644 (file)
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -635,29 +635,6 @@ NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups,
        return token;
 }
 
-static void add_foreign_gids(uid_t uid, gid_t gid,
-                            gid_t **groups, int *ngroups)
-{
-       int i, dom_groups;
-       DOM_SID sid;
-
-       if (NT_STATUS_IS_OK(uid_to_sid(&sid, uid)))
-               add_foreign_gids_from_sid(&sid, groups, ngroups);
-
-       if (NT_STATUS_IS_OK(gid_to_sid(&sid, gid)))
-               add_foreign_gids_from_sid(&sid, groups, ngroups);
-
-       dom_groups = *ngroups;
-
-       for (i=0; i<dom_groups; i++) {
-
-               if (!NT_STATUS_IS_OK(gid_to_sid(&sid, (*groups)[i])))
-                       continue;
-
-               add_foreign_gids_from_sid(&sid, groups, ngroups);
-       }
-}
-
 /******************************************************************************
  * this function returns the groups (SIDs) of the local SAM the user is in.
  * If this samba server is a DC of the domain the user belongs to, it returns 
@@ -722,8 +699,6 @@ static NTSTATUS get_user_groups(const char *username, uid_t uid, gid_t gid,
                }
        }
 
-       add_foreign_gids(uid, gid, unix_groups, &n_unix_groups);
-
        debug_unix_user_token(DBGC_CLASS, 5, uid, gid, n_unix_groups, *unix_groups);
        
        /* now setup the space for storing the SIDS */