Author: vlendec Date: 2004-11-05 21:55:21 +0000 (Fri, 05 Nov 2004) New Revision: 3561
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3561 Log: Since we have tdb_reopen_all() after all forks, the local_pid logic is not correct anymore. If we actually open the tdb before the fork, we end up opening the tdb twice. Jerry, jra, this also happens in the locking and printing subsystems. You might want to check it there (not that it actually happens right now, but this gave me some confusion lately...). Volker Modified: branches/SAMBA_3_0/source/groupdb/mapping.c branches/SAMBA_3_0/source/lib/account_pol.c Changeset: Modified: branches/SAMBA_3_0/source/groupdb/mapping.c =================================================================== --- branches/SAMBA_3_0/source/groupdb/mapping.c 2004-11-05 21:45:35 UTC (rev 3560) +++ branches/SAMBA_3_0/source/groupdb/mapping.c 2004-11-05 21:55:21 UTC (rev 3561) @@ -135,11 +135,10 @@ static BOOL init_group_mapping(void) { - static pid_t local_pid; const char *vstring = "INFO/version"; int32 vers_id; - if (tdb && local_pid == sys_getpid()) + if (tdb) return True; tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb) { @@ -147,8 +146,6 @@ return False; } - local_pid = sys_getpid(); - /* handle a Samba upgrade */ tdb_lock_bystring(tdb, vstring, 0); Modified: branches/SAMBA_3_0/source/lib/account_pol.c =================================================================== --- branches/SAMBA_3_0/source/lib/account_pol.c 2004-11-05 21:45:35 UTC (rev 3560) +++ branches/SAMBA_3_0/source/lib/account_pol.c 2004-11-05 21:55:21 UTC (rev 3561) @@ -30,11 +30,10 @@ BOOL init_account_policy(void) { - static pid_t local_pid; const char *vstring = "INFO/version"; uint32 version; - if (tdb && local_pid == sys_getpid()) + if (tdb) return True; tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb) { @@ -42,8 +41,6 @@ return False; } - local_pid = sys_getpid(); - /* handle a Samba upgrade */ tdb_lock_bystring(tdb, vstring,0); if (!tdb_fetch_uint32(tdb, vstring, &version) || version != DATABASE_VERSION) {
