[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  6727429 s3:registry: prevent unnecessary transactions in regdb_init
      from  e66ceb6 s3: Use autotools to set the winbind socket directory.

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


- Log -----------------------------------------------------------------
commit 6727429aea4505d085bcf6f22dd316e7123f0e83
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 9 11:14:38 2011 +0100

    s3:registry: prevent unnecessary transactions in regdb_init
    
    Skip the transaction for the upgrade code, if the database
    is already at code-level.
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Nov  9 15:06:59 CET 2011 on sn-devel-104

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

Summary of changes:
 source3/registry/reg_backend_db.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 7fa6249..4d4aaeb 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -687,6 +687,10 @@ WERROR regdb_init(void)
 		vers_id = REGDB_VERSION_V1;
 	}
 
+	if (vers_id == REGDB_CODE_VERSION) {
+		return WERR_OK;
+	}
+
 	if (vers_id > REGDB_CODE_VERSION || vers_id == 0) {
 		DEBUG(0, ("regdb_init: unknown registry version %d "
 			  "(code version = %d), refusing initialization\n",


-- 
Samba Shared Repository