Dual winbind daemons - fix to winbindd_dual.c

[Ken Cross]

Samba-folk:

The dual winbindd daemon hasn't been working (at least not on NetBSD).
It always bombs out with

 [2003/02/11 10:03:23, 2] tdb/tdbutil.c:tdb_log(582)
   tdb(unnamed): tdb_open_ex: /var/samba/locks/winbindd_idmap.tdb
(0,162792) is already open in this process
 [2003/02/11 10:03:23, 0]
nsswitch/winbindd_idmap.c:winbindd_idmap_init(438)
   winbindd_idmap_init: Unable to open idmap database

and then becomes a zombie.  The one-line fix below closes idmap before
calling winbind_setup_common.

BTW, I haven't really had a chance to test it -- does the dual daemon
thing work well?

Ken Cross
Network Storage Solutions




Index: winbindd_dual.c
===================================================================
RCS file: /cvsroot/samba/source/nsswitch/winbindd_dual.c,v
retrieving revision 1.3.2.4
diff -p -u -r1.3.2.4 winbindd_dual.c
--- winbindd_dual.c     9 Nov 2002 04:36:43 -0000       1.3.2.4
+++ winbindd_dual.c     12 Feb 2003 02:39:05 -0000
@@ -160,6 +160,8 @@ void do_dual_daemon(void)
        }
        close(fdpair[1]);
        
+       winbindd_idmap_close();  /* KJC */
+
        if (!winbind_setup_common()) 
                _exit(0);