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

Michael
(This used to be commit 235a5ae4cdf3ea238728c2e89a4318c18257426a)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5255c95c27f3e7ecb513b315cb70bd56fb8c80a8..ed77cfda43505f8da243fa97087077afa821b3c7 100644 (file)
--- 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;
 }