diff options
| author | Günther Deschner <gd@samba.org> | 2008-03-06 00:51:20 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-03-06 09:59:49 +0100 |
| commit | eb0e549b670b22a524ab0dbcbc2b41450cedd520 (patch) | |
| tree | ac1f257837940d2c786490f03bc154e89a585c61 | |
| parent | 7f80099e52f4c795bd4c23fd073bde975d2802a0 (diff) | |
| download | samba-eb0e549b670b22a524ab0dbcbc2b41450cedd520.tar.gz samba-eb0e549b670b22a524ab0dbcbc2b41450cedd520.tar.bz2 samba-eb0e549b670b22a524ab0dbcbc2b41450cedd520.zip | |
Fix lp_load with an empty registry and "config backend = registry". Michael, please check.
Guenther
(cherry picked from commit d9f4060c660da0ad671e061b123df71d109d51b9)
(This used to be commit 11b151f3552cbcddcfe671dcda4fe0110c4f2b48)
| -rw-r--r-- | source3/param/loadparm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5651a435de..25aa48b61b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3404,6 +3404,13 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *)) } } + if (!libnet_conf_share_exists(conf_ctx, GLOBAL_NAME)) { + /* nothing to read from the registry yet but make sure lp_load + * doesn't return false */ + ret = true; + goto done; + } + werr = libnet_conf_get_share(mem_ctx, conf_ctx, GLOBAL_NAME, &num_params, ¶m_names, ¶m_values); if (!W_ERROR_IS_OK(werr)) { |