svn commit: samba r25036 - in branches: SAMBA_3_2/source/param SAMBA_3_2_0/source/param

vlendec at samba.org vlendec at samba.org
Sat Sep 8 17:09:01 GMT 2007


Author: vlendec
Date: 2007-09-08 17:08:59 +0000 (Sat, 08 Sep 2007)
New Revision: 25036

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25036

Log:
Fix a become/unbecome_root() pair
Modified:
   branches/SAMBA_3_2/source/param/loadparm.c
   branches/SAMBA_3_2_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_2/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2/source/param/loadparm.c	2007-09-08 16:46:30 UTC (rev 25035)
+++ branches/SAMBA_3_2/source/param/loadparm.c	2007-09-08 17:08:59 UTC (rev 25036)
@@ -3330,6 +3330,7 @@
 	become_root();
 	reg_tdb = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, 
 				REG_TDB_FLAGS, O_RDWR, 0600);
+	unbecome_root();
 	if (!reg_tdb) {
 		DEBUG(1, ("lp_regdb_open: failed to open %s: %s\n",
 			 lock_path("registry.tdb"), strerror(errno)));
@@ -3338,7 +3339,6 @@
 	else {
 		DEBUG(10, ("lp_regdb_open: reg tdb opened.\n"));
 	}
-	unbecome_root();
 
 	vers_id = tdb_fetch_int32(reg_tdb->tdb, vstring);
 	if (vers_id != REGVER_V1) {

Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2_0/source/param/loadparm.c	2007-09-08 16:46:30 UTC (rev 25035)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c	2007-09-08 17:08:59 UTC (rev 25036)
@@ -3338,6 +3338,7 @@
 	become_root();
 	reg_tdb = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, 
 				REG_TDB_FLAGS, O_RDWR, 0600);
+	unbecome_root();
 	if (!reg_tdb) {
 		DEBUG(1, ("lp_regdb_open: failed to open %s: %s\n",
 			 lock_path("registry.tdb"), strerror(errno)));
@@ -3346,7 +3347,6 @@
 	else {
 		DEBUG(10, ("lp_regdb_open: reg tdb opened.\n"));
 	}
-	unbecome_root();
 
 	vers_id = tdb_fetch_int32(reg_tdb->tdb, vstring);
 	if (vers_id != REGVER_V1) {



More information about the samba-cvs mailing list