From e84ead0cfdc5e45a577387cc54dceb4c3f32948a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 27 Mar 2005 16:33:04 +0000 Subject: r6080: Port some of the non-critical changes from HEAD to 3_0. The main one is the change in pdb_enum_alias_memberships to match samr.idl a bit closer. Volker (This used to be commit 3a6786516957d9f67af6d53a3167c88aa272972f) --- source3/lib/privileges.c | 2 +- source3/lib/system_smbd.c | 4 ++-- source3/lib/util.c | 10 +++++++--- source3/lib/util_sid.c | 27 +++++++++++++++++++++++---- source3/lib/util_smbd.c | 4 ++-- 5 files changed, 35 insertions(+), 12 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index b60832c8d8..e01561de06 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -497,7 +497,7 @@ static int priv_traverse_fn(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *s return 0; } - add_sid_to_array( &sid, &priv->sids.list, &priv->sids.count ); + add_sid_to_array( NULL, &sid, &priv->sids.list, &priv->sids.count ); return 0; } diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c index c83eecf173..f124983006 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -178,10 +178,10 @@ BOOL getgroups_user(const char *user, gid_t primary_gid, groups = NULL; /* Add in primary group first */ - add_gid_to_array_unique(primary_gid, &groups, &ngrp); + add_gid_to_array_unique(NULL, primary_gid, &groups, &ngrp); for (i=0; i