diff options
| author | Gerald Carter <jerry@samba.org> | 2006-07-13 18:10:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:19:20 -0500 |
| commit | 0ea9508d53be8949ddf04e202c025d91d2934440 (patch) | |
| tree | ab76aa26cca70e6664fec1b16d35ef0681530555 /source3/nsswitch | |
| parent | 803748b15dec1787ab5be9df3b039f59a34f8ee6 (diff) | |
| download | samba-0ea9508d53be8949ddf04e202c025d91d2934440.tar.gz samba-0ea9508d53be8949ddf04e202c025d91d2934440.tar.bz2 samba-0ea9508d53be8949ddf04e202c025d91d2934440.zip | |
r17021: remove unsupported smbwrapper code
(This used to be commit 07c67fbfc0790169ee748c0e62da14c89d3add23)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_async.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_async.c b/source3/nsswitch/winbindd_async.c index 6169b8299e..808e73209d 100644 --- a/source3/nsswitch/winbindd_async.c +++ b/source3/nsswitch/winbindd_async.c @@ -4,7 +4,7 @@ Async helpers for blocking functions Copyright (C) Volker Lendecke 2005 - Copyright (C) Volker Lendecke 2006 + Copyright (C) Gerald Carter 2006 The helpers always consist of three functions: diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index c0da45d8d0..f85a1ecec6 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -41,8 +41,15 @@ static BOOL fill_grent(struct winbindd_gr *gr, const char *dom_name, const char *gr_name, gid_t unix_gid) { fstring full_group_name; + BOOL can_assume = False; - fill_domain_username( full_group_name, dom_name, gr_name, False); + /* I *hate* winbind use default domain!!!! Somehow I will figure out + how to remove this parameter. -jerry */ + + if ( (lp_server_role() == ROLE_DOMAIN_MEMBER) && strequal(dom_name, lp_workgroup() ) ) + can_assume = True; + + fill_domain_username( full_group_name, dom_name, gr_name, can_assume); gr->gr_gid = unix_gid; |