diff options
| author | Gerald Carter <jerry@samba.org> | 2003-08-06 18:01:39 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-08-06 18:01:39 +0000 |
| commit | df2337692aea7d5ee9a6898434ad94a1ca646e8c (patch) | |
| tree | 9a9f9ef0db345284603f9c14ae5b76186b4891be /source3/nsswitch | |
| parent | 923cb1b7315e4dfd9fe7fff5183635702083c023 (diff) | |
| download | samba-df2337692aea7d5ee9a6898434ad94a1ca646e8c.tar.gz samba-df2337692aea7d5ee9a6898434ad94a1ca646e8c.tar.bz2 samba-df2337692aea7d5ee9a6898434ad94a1ca646e8c.zip | |
rework winbindd_accountdb_init() to reduce error messages in the log
(This used to be commit d98a68e0ebaf2fbd360b826f5df472bc3f94285b)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_acct.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/nsswitch/winbindd_acct.c b/source3/nsswitch/winbindd_acct.c index 8abfd17110..0c06df7fdd 100644 --- a/source3/nsswitch/winbindd_acct.c +++ b/source3/nsswitch/winbindd_acct.c @@ -70,18 +70,13 @@ static BOOL winbindd_accountdb_init(void) if ( account_tdb ) return True; - - /* Nope. Try to open it */ - if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, - TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) - { - /* last chance -- maybe idmap has already opened it */ - if ( !(account_tdb = idmap_tdb_handle()) ) { + /* winbindd_idmap.tdb should always be opened by the idmap_init() + code first */ - DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); - return False; - } + if ( !(account_tdb = idmap_tdb_handle()) ) { + DEBUG(0, ("winbindd_accountdb_init: Unable to retreive handle for database\n")); + return False; } /* yeah! */ |