diff options
| author | Gerald Carter <jerry@samba.org> | 2003-07-07 05:11:10 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-07-07 05:11:10 +0000 |
| commit | 0b18acb841f6a372b3aa285d4734875e5e35fe3b (patch) | |
| tree | add4afee2b70d87bfd96b7702d9d6a2476ac7e74 /source3/lib | |
| parent | b5cd4a8643169b276a3af8a9272d212d76a54dd3 (diff) | |
| download | samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.tar.gz samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.tar.bz2 samba-0b18acb841f6a372b3aa285d4734875e5e35fe3b.zip | |
and so it begins....
* remove idmap_XX_to_XX calls from smbd. Move back to the
the winbind_XXX and local_XXX calls used in 2.2
* all uid/gid allocation must involve winbindd now
* move flags field around in winbindd_request struct
* add WBFLAG_QUERY_ONLY option to winbindd_sid_to_[ug]id()
to prevent automatic allocation for unknown SIDs
* add 'winbind trusted domains only' parameter to force a domain member
server to use matching users names from /etc/passwd for its domain
(needed for domain member of a Samba domain)
* rename 'idmap only' to 'enable rid algorithm' for better clarity
(defaults to "yes")
code has been tested on
* domain member of native mode 2k domain
* ads domain member of native mode 2k domain
* domain member of NT4 domain
* domain member of Samba domain
* Samba PDC running winbindd with trusts
Logons tested using 2k clients and smbclient as domain users
and trusted users. Tested both 'winbind trusted domains only = [yes|no]'
This will be a long week of changes. The next item on the list is
winbindd_passdb.c & machine trust accounts not in /etc/passwd (done
via winbindd_passdb)
(This used to be commit 8266dffab4aedba12a33289ff32880037ce950a8)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/smbldap.c | 2 | ||||
| -rw-r--r-- | source3/lib/system_smbd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index e0c6aab617..cba73d386c 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -815,7 +815,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) } if (ldap_state->ldap_struct != NULL) { - DEBUG(5,("smbldap_open: already connected to the LDAP server\n")); + DEBUG(11,("smbldap_open: already connected to the LDAP server\n")); return LDAP_SUCCESS; } diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c index 3498307acb..bcbc8c61e6 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -114,7 +114,7 @@ int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *grpcnt) /* see if we should disable winbindd lookups for local users */ if ( (p = strchr(user, *lp_winbind_separator())) == NULL ) { - if ( setenv(WINBINDD_DONT_ENV, "1", 1) == -1 ) + if ( !winbind_off() ) DEBUG(0,("sys_getgroup_list: Insufficient environment space for %s\n", WINBINDD_DONT_ENV)); else @@ -131,7 +131,7 @@ int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *grpcnt) #endif /* allow winbindd lookups */ - setenv( WINBINDD_DONT_ENV, "0", 1); + winbind_on(); return retval; } |