sync 3.0 into HEAD for the last time

[vlendec/samba-autobuild/.git] / source3 / nsswitch / winbindd_acct.c

diff --git a/source3/nsswitch/winbindd_acct.c b/source3/nsswitch/winbindd_acct.c
index 8abfd17110804a3ac024747227df214f4037669d..0c06df7fdd4670a434ec835c939a2bbdea08554f 100644 (file)
--- 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! */