summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-06-21 20:56:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:31 -0500
commit510ba543ccf8ab4c58a18e35c2f63df5de49d0c3 (patch)
treef41122c5bddb0d45419891995f0058f0d153c2af
parentead4ea509ebd61db055658abdb5ee979cbe786eb (diff)
downloadsamba-510ba543ccf8ab4c58a18e35c2f63df5de49d0c3.tar.gz
samba-510ba543ccf8ab4c58a18e35c2f63df5de49d0c3.tar.bz2
samba-510ba543ccf8ab4c58a18e35c2f63df5de49d0c3.zip
r23575: Fix a segfault when lp_load is called before init_registry.
Michael (This used to be commit 235a5ae4cdf3ea238728c2e89a4318c18257426a)
-rw-r--r--source3/param/loadparm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5255c95c27..ed77cfda43 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3071,6 +3071,7 @@ static struct tdb_wrap *lp_regdb_open(void)
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 @@ static struct tdb_wrap *lp_regdb_open(void)
/* this is apparently not implemented in the tdb */
}
+done:
return reg_tdb;
}