svn commit: samba r23575 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param

[obnox at samba.org]

Author: obnox
Date: 2007-06-21 20:56:56 +0000 (Thu, 21 Jun 2007)
New Revision: 23575

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

Log:
Fix a segfault when lp_load is called before init_registry.

Michael


Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0_26/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2007-06-21 19:40:51 UTC (rev 23574)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2007-06-21 20:56:56 UTC (rev 23575)
@@ -3071,6 +3071,7 @@
 	if (!reg_tdb) {
 		DEBUG(0, ("lp_regdb_open: failed to open %s: %s\n",
 			 lock_path("registry.tdb"), strerror(errno)));
+		goto done;
 	}
 	else {
 		DEBUG(10, ("lp_regdb_open: reg tdb opened.\n"));
@@ -3085,6 +3086,7 @@
 		/* this is apparently not implemented in the tdb */
 	}
 
+done:
 	return reg_tdb;
 }
 

Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-21 19:40:51 UTC (rev 23574)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-21 20:56:56 UTC (rev 23575)
@@ -3072,6 +3072,7 @@
 	if (!reg_tdb) {
 		DEBUG(0, ("lp_regdb_open: failed to open %s: %s\n",
 			 lock_path("registry.tdb"), strerror(errno)));
+		goto done;
 	}
 	else {
 		DEBUG(10, ("lp_regdb_open: reg tdb opened.\n"));
@@ -3086,6 +3087,7 @@
 		/* this is apparently not implemented in the tdb */
 	}
 
+done:
 	return reg_tdb;
 }