1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-09 00:23:50 +03:00

r14855: Various fixes:

* depreacte 'acl group control' after discussion with Jeremy
  and implement functionality as part of 'dos filemode'
* fix winbindd on a non-member server to expand local groups
* prevent code previously only used by smbd from blindly
  turning _NO_WINBINDD back on
This commit is contained in:
Gerald Carter
2006-04-02 06:25:11 +00:00
committed by Gerald (Jerry) Carter
parent 9a763da073
commit 4ab372f4ca
9 changed files with 74 additions and 48 deletions

View File

@@ -120,14 +120,19 @@ static int getgrouplist_internals(const char *user, gid_t gid, gid_t *groups,
static int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *grpcnt)
{
int retval;
char *winbindd_env;
DEBUG(10,("sys_getgrouplist: user [%s]\n", user));
/* Save the winbindd state and not just blindly turn it back on */
winbindd_env = getenv(WINBINDD_DONT_ENV);
/* This is only ever called for Unix users, remote memberships are
* always determined by the info3 coming back from auth3 or the
* PAC. */
if ( !winbind_off() ) {
if ( !winbind_putenv("0") ) {
DEBUG(0,("sys_getgroup_list: Insufficient environment space "
"for %s\n", WINBINDD_DONT_ENV));
} else {
@@ -144,7 +149,8 @@ static int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *grp
#endif
/* allow winbindd lookups */
winbind_on();
winbind_putenv( winbindd_env ? winbindd_env : "1" );
return retval;
}