diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-01 04:35:31 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-03-01 04:35:31 +0000 |
| commit | 03984b463596cd654bef952d024b96252909c7c7 (patch) | |
| tree | 0a278d3c6c5f7cc395772bebc39c8930c134805c /source/nsswitch/winbindd.c | |
| parent | fec07a7bb897b3c3723d5cb047daa86b45e5e9fd (diff) | |
| download | samba-03984b463596cd654bef952d024b96252909c7c7.tar.gz samba-03984b463596cd654bef952d024b96252909c7c7.tar.xz samba-03984b463596cd654bef952d024b96252909c7c7.zip | |
r21619: * Pickup latest changes from SAMBA_3_0_25 (this will be it
for 3.0.25pre1 unless something blows up)
* Update release notes some more
Diffstat (limited to 'source/nsswitch/winbindd.c')
| -rw-r--r-- | source/nsswitch/winbindd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c index b4570f2525a..e0b126f9f2f 100644 --- a/source/nsswitch/winbindd.c +++ b/source/nsswitch/winbindd.c @@ -1011,14 +1011,10 @@ int main(int argc, char **argv, char **envp) /* Winbind daemon initialisation */ - if ( ! NT_STATUS_IS_OK(idmap_init()) ) { - DEBUG(1, ("Could not init idmap! - Sid/[UG]id mapping will not be available\n")); + if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) { + DEBUG(1, ("Could not init idmap cache!\n")); } -#ifdef WITH_ADS - nss_init( lp_winbind_nss_info() ); -#endif - /* Unblock all signals we are interested in as they may have been blocked by the parent process. */ @@ -1084,6 +1080,7 @@ int main(int argc, char **argv, char **envp) DEBUG(0,("unable to initalize domain list\n")); exit(1); } +#endif init_idmap_child(); |