summaryrefslogtreecommitdiff
path: root/source3/auth/server_info_sam.c
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-28 17:03:18 -0400
committerAndrew Bartlett <abartlet@samba.org>2010-06-07 22:53:07 +1000
commitaaf45cd48ecf8e9f640a6f487b66785d47b8154a (patch)
tree8a7a8efa994b3b183e496ccd64354146053e6813 /source3/auth/server_info_sam.c
parentaa1a3cbad2ed62d5b59c48a6e7726eef4776f461 (diff)
downloadsamba-aaf45cd48ecf8e9f640a6f487b66785d47b8154a.tar.gz
samba-aaf45cd48ecf8e9f640a6f487b66785d47b8154a.tar.bz2
samba-aaf45cd48ecf8e9f640a6f487b66785d47b8154a.zip
s3:auth remove unused structure member
sids are now completely handled using info3, remove dead code that fills server info sids and the structure members themselves Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/auth/server_info_sam.c')
-rw-r--r--source3/auth/server_info_sam.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index 9072b6314a..7a33aab2a2 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -61,7 +61,6 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
struct samu *sampass)
{
struct passwd *pwd;
- gid_t *gids;
struct auth_serversupplied_info *result;
const char *username = pdb_get_username(sampass);
NTSTATUS status;
@@ -101,16 +100,6 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
if (IS_DC && is_our_machine_account(username)) {
/*
- * Ensure for a connection from our own
- * machine account (from winbindd on a DC)
- * there are no supplementary groups.
- * Prevents loops in calling gid_to_sid().
- */
- result->sids = NULL;
- gids = NULL;
- result->num_sids = 0;
-
- /*
* This is a hack of monstrous proportions.
* If we know it's winbindd talking to us,
* we know we must never recurse into it,
@@ -123,28 +112,9 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
(void)winbind_off();
DEBUG(10, ("make_server_info_sam: our machine account %s "
- "setting supplementary group list empty and "
- "turning off winbindd requests.\n",
- username));
- } else {
- status = pdb_enum_group_memberships(result, sampass,
- &result->sids, &gids,
- &result->num_sids);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, ("pdb_enum_group_memberships failed: %s\n",
- nt_errstr(status)));
- TALLOC_FREE(result);
- return status;
- }
+ "turning off winbindd requests.\n", username));
}
- /* For now we throw away the gids and convert via sid_to_gid
- * later. This needs fixing, but I'd like to get the code straight and
- * simple first. */
-
- TALLOC_FREE(gids);
-
DEBUG(5,("make_server_info_sam: made server info for user %s -> %s\n",
pdb_get_username(sampass), result->unix_name));