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 | d98a68e0ebaf2fbd360b826f5df472bc3f94285b (patch) | |
tree | 9bae7ad257351e9cc9aec99f344d40243fb102f4 /source/nsswitch | |
parent | 7ce94d39add6e056e3b1deea21bf0438ba61e4cc (diff) | |
download | samba-d98a68e0ebaf2fbd360b826f5df472bc3f94285b.tar.gz samba-d98a68e0ebaf2fbd360b826f5df472bc3f94285b.tar.xz samba-d98a68e0ebaf2fbd360b826f5df472bc3f94285b.zip |
rework winbindd_accountdb_init() to reduce error messages in the log
Diffstat (limited to 'source/nsswitch')
-rw-r--r-- | source/nsswitch/winbindd_acct.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/nsswitch/winbindd_acct.c b/source/nsswitch/winbindd_acct.c index 8abfd171108..0c06df7fdd4 100644 --- a/source/nsswitch/winbindd_acct.c +++ b/source/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! */ |