[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-802-g6edaf61

[Michael Adam]

The branch, master has been updated
       via  6edaf6188c8c27e319357aba920725c5c0af815e (commit)
      from  1e92ddd40523f053513f9d12611e5a70c8a425f0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6edaf6188c8c27e319357aba920725c5c0af815e
Author: Michael Adam <ob...@samba.org>
Date:   Wed Apr 1 12:23:07 2009 +0200

    s3: fix the fix for bug #6195 - dont let smbd child processes panic
    
    This patch makes sure the original and temporary TDBs are closed
    _before_ the rename. Originally, the open TDB was renamed, and so
    the name passdb.tdb.tmp stayed around in the db context. Hence
    upon client connect, the smbd children died because reinit_after_fork()
    calling tdb_reopen_all() would try to reopen passdb.tdb.tmp which
    existed no longer...
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_tdb.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 1060733..6c49eb1 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -250,6 +250,11 @@ static bool tdbsam_convert_backup(const char *dbname, 
struct db_context **pp_db)
                smb_panic("tdbsam_convert_backup: orig commit failed\n");
        }
 
+       /* be sure to close the DBs _before_ renaming the file */
+
+       TALLOC_FREE(orig_db);
+       TALLOC_FREE(tmp_db);
+
        /* This is safe from other users as we know we're
         * under a mutex here. */
 
@@ -262,13 +267,22 @@ static bool tdbsam_convert_backup(const char *dbname, 
struct db_context **pp_db)
        }
 
        TALLOC_FREE(frame);
-       TALLOC_FREE(orig_db);
+
+       /* re-open the converted TDB */
+
+       orig_db = db_open(NULL, dbname, 0,
+                         TDB_DEFAULT, O_CREAT|O_RDWR, 0600);
+       if (orig_db == NULL) {
+               DEBUG(0, ("tdbsam_convert_backup: Failed to re-open "
+                         "converted passdb TDB [%s]\n", dbname));
+               return false;
+       }
 
        DEBUG(1, ("tdbsam_convert_backup: updated %s file.\n",
                dbname ));
 
        /* Replace the global db pointer. */
-       *pp_db = tmp_db;
+       *pp_db = orig_db;
        return true;
 
   cancel:


-- 
Samba Shared Repository