libsmbconf:registry: Ignore keyless smb.conf regvalues

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index bc878cc5d210c424f381707a57809f082451a6d1..e756580ceeb4f9d2ff3c30ae47fcb2fb70767cef 100644 (file)
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -530,29 +530,6 @@ done:
        return err;
 }
 
-static bool smbconf_reg_key_has_values(struct registry_key *key)
-{
-       WERROR werr;
-       uint32_t num_subkeys;
-       uint32_t max_subkeylen;
-       uint32_t max_subkeysize;
-       uint32_t num_values;
-       uint32_t max_valnamelen;
-       uint32_t max_valbufsize;
-       uint32_t secdescsize;
-       NTTIME last_changed_time;
-
-       werr = reg_queryinfokey(key, &num_subkeys, &max_subkeylen,
-                               &max_subkeysize, &num_values, &max_valnamelen,
-                               &max_valbufsize, &secdescsize,
-                               &last_changed_time);
-       if (!W_ERROR_IS_OK(werr)) {
-               return false;
-       }
-
-       return (num_values != 0);
-}
-
 /**
  * delete all values from a key
  */
@@ -806,17 +783,6 @@ static sbcErr smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
 
        tmp_ctx = talloc_stackframe();
 
-       /* if there are values in the base key, return NULL as share name */
-
-       if (smbconf_reg_key_has_values(rpd(ctx)->base_key)) {
-               err = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,
-                                                  0, NULL);
-               if (!SBC_ERROR_IS_OK(err)) {
-                       goto done;
-               }
-               added_count++;
-       }
-
        /* make sure "global" is always listed first */
        if (smbconf_share_exists(ctx, GLOBAL_NAME)) {
                err = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,