Changeset 988 for vendor/current/source3/lib/smbconf

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source3/lib/smbconf

Files:

• smbconf_reg.c (modified) (15 diffs)
• smbconf_reg.h (modified) (1 diff)
• testsuite.c (modified) (7 diffs)

vendor/current/source3/lib/smbconf/smbconf_reg.c

@@ -51 +51 @@
 }
 
-/*
- * check whether a given value name is forbidden in registry (smbconf)
- */
-static bool smbconf_reg_valname_forbidden(const char *valname)
+/**
+ * Check whether a given parameter name is valid in the
+ * smbconf registry backend.
+ */
+bool smbconf_reg_parameter_is_valid(const char *param_name)
 {
         /* hard code the list of forbidden names here for now */
-        const char *forbidden_valnames[] = {
+        const char *forbidden_names[] = {
+                "state directory",
                 "lock directory",
                 "lock dir",
                 "config backend",
                 "include",
-                "includes", /* this has a special meaning internally */
+                /*
+                 * "includes" has a special meaning internally.
+                 * It is currently not necessary to list it here since it is
+                 * not a valid parameter. But for clarity and safety, we keep
+                 * it for now.
+                 */
+                INCLUDES_VALNAME,
                 NULL
         };
         const char **forbidden = NULL;
 
-        for (forbidden = forbidden_valnames; *forbidden != NULL; forbidden++) {
-                if (strwicmp(valname, *forbidden) == 0) {
-                        return true;
-                }
-        }
-        return false;
-}
-
-static bool smbconf_reg_valname_valid(const char *valname)
-{
-        return (!smbconf_reg_valname_forbidden(valname) &&
-                lp_parameter_is_valid(valname));
+        if (!lp_parameter_is_valid(param_name)) {
+                return false;
+        }
+
+        for (forbidden = forbidden_names; *forbidden != NULL; forbidden++) {
+                if (strwicmp(param_name, *forbidden) == 0) {
+                        return false;
+                }
+        }
+
+        return true;
 }
 
@@ -87 +94 @@
                                            struct smbconf_ctx *ctx,
                                            const char *servicename,
-                                           uint32 desired_access,
+                                           uint32_t desired_access,
                                            struct registry_key **key)
 {
@@ -175 +182 @@
         const char *canon_valstr;
 
-        if (!lp_canonicalize_parameter_with_value(valname, valstr,
-                                                  &canon_valname,
-                                                  &canon_valstr))
-        {
-                if (canon_valname == NULL) {
-                        DEBUG(5, ("invalid parameter '%s' given\n",
-                                  valname));
-                } else {
-                        DEBUG(5, ("invalid value '%s' given for "
-                                  "parameter '%s'\n", valstr, valname));
-                }
+        if (!lp_parameter_is_valid(valname)) {
+                DEBUG(5, ("Invalid parameter '%s' given.\n", valname));
                 err = SBC_ERR_INVALID_PARAM;
                 goto done;
         }
 
-        if (smbconf_reg_valname_forbidden(canon_valname)) {
+        if (!smbconf_reg_parameter_is_valid(valname)) {
                 DEBUG(5, ("Parameter '%s' not allowed in registry.\n",
-                          canon_valname));
+                          valname));
                 err = SBC_ERR_INVALID_PARAM;
                 goto done;
@@ -209 +207 @@
         {
                 DEBUG(5, ("Global parameter '%s' not allowed in "
-                          "service definition ('%s').\n", canon_valname,
+                          "service definition ('%s').\n", valname,
                           subkeyname));
+                err = SBC_ERR_INVALID_PARAM;
+                goto done;
+        }
+
+        if (!lp_canonicalize_parameter_with_value(valname, valstr,
+                                                  &canon_valname,
+                                                  &canon_valstr))
+        {
+                /*
+                 * We already know the parameter name is valid.
+                 * So the value must be invalid.
+                 */
+                DEBUG(5, ("invalid value '%s' given for parameter '%s'\n",
+                          valstr, valname));
                 err = SBC_ERR_INVALID_PARAM;
                 goto done;
@@ -260 +272 @@
         }
 
-        value = TALLOC_ZERO_P(tmp_ctx, struct registry_value);
+        value = talloc_zero(tmp_ctx, struct registry_value);
         if (value == NULL) {
                 err = SBC_ERR_NOMEM;
@@ -327 +339 @@
         }
         case REG_MULTI_SZ: {
-                uint32 j;
+                uint32_t j;
                 const char **a = NULL;
                 if (!pull_reg_multi_sz(mem_ctx, &value->data, &a)) {
@@ -457 +469 @@
                 char *valstring;
 
-                if (!smbconf_reg_valname_valid(valname)) {
+                if (!smbconf_reg_parameter_is_valid(valname)) {
                         continue;
                 }
@@ -517 +529 @@
         talloc_free(tmp_ctx);
         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);
 }
 
@@ -605 +594 @@
         }
 
-        ctx->data = TALLOC_ZERO_P(ctx, struct reg_private_data);
+        ctx->data = talloc_zero(ctx, struct reg_private_data);
 
         werr = ntstatus_to_werror(registry_create_admin_token(ctx, &token));
@@ -646 +635 @@
 static bool smbconf_reg_requires_messaging(struct smbconf_ctx *ctx)
 {
-#ifdef CLUSTER_SUPPORT
         if (lp_clustering() && lp_parm_bool(-1, "ctdb", "registry.tdb", true)) {
                 return true;
         }
-#endif
+
         return false;
 }
@@ -755 +743 @@
         }
 
-        werr = reg_deletekey_recursive(parent_key, p+1);
+        werr = reg_deletesubkeys_recursive(parent_key, p+1);
         if (!W_ERROR_IS_OK(werr)) {
                 err = SBC_ERR_IO_FAILURE;
@@ -795 +783 @@
 
         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 */
@@ -914 +891 @@
         }
 
-        tmp_service = TALLOC_ZERO_P(tmp_ctx, struct smbconf_service);
+        tmp_service = talloc_zero(tmp_ctx, struct smbconf_service);
         if (tmp_service == NULL) {
                 err = SBC_ERR_NOMEM;
@@ -1009 +986 @@
         }
 
-        if (!smbconf_reg_valname_valid(param)) {
+        if (!smbconf_reg_parameter_is_valid(param)) {
                 err = SBC_ERR_INVALID_PARAM;
                 goto done;
@@ -1054 +1031 @@
         }
 
-        if (!smbconf_reg_valname_valid(param)) {
+        if (!smbconf_reg_parameter_is_valid(param)) {
                 err = SBC_ERR_INVALID_PARAM;
                 goto done;

vendor/current/source3/lib/smbconf/smbconf_reg.h

@@ -30 +30 @@
                         const char *path);
 
+/**
+ * Check whether a given parameter name is valid in the
+ * smbconf registry backend.
+ */
+bool smbconf_reg_parameter_is_valid(const char *param_name);
 
 #endif /*  _LIBSMBCONF_REG_H_  */

vendor/current/source3/lib/smbconf/testsuite.c

@@ -26 +26 @@
 
 static void print_strings(const char *prefix,
-                          uint32_t num_strings, const char **strings)
+                          uint32_t num_strings,
+                          const char * const *strings)
 {
         uint32_t count;
@@ -57 +58 @@
         printf("got %u includes%s\n", num_includes,
                (num_includes > 0) ? ":" : ".");
-        print_strings("", num_includes, (const char **)includes);
+        print_strings("", num_includes, (const char * const *)includes);
 
         printf("OK: get_includes\n");
@@ -107 +108 @@
                 if (!strequal(set_includes[count], get_includes[count])) {
                         printf("expected: \n");
-                        print_strings("* ", set_num_includes, set_includes);
+                        print_strings("* ", set_num_includes,
+                                      (const char * const *)set_includes);
                         printf("got: \n");
                         print_strings("* ", get_num_includes,
-                                      (const char **)get_includes);
+                                      (const char * const *)get_includes);
                         printf("FAIL: get_set_includes - data mismatch:\n");
                         goto done;
@@ -176 +178 @@
 
 done:
+        talloc_free(mem_ctx);
         return ret;
 }
@@ -184 +187 @@
 
         printf("TEST: creating file\n");
-        f = sys_fopen(filename, "w");
+        f = fopen(filename, "w");
         if (!f) {
                 printf("failure: failed to open %s for writing: %s\n",
@@ -294 +297 @@
         };
 
-        load_case_tables();
+        smb_init_locale();
         setup_logging(argv[0], DEBUG_STDERR);
 
@@ -305 +308 @@
         poptFreeContext(pc);
 
-        ret = lp_load(get_dyn_CONFIGFILE(),
-                      true,  /* globals_only */
-                      false, /* save_defaults */
-                      false, /* add_ipc */
-                      true   /* initialize globals */);
-
+        ret = lp_load_global(get_dyn_CONFIGFILE());
         if (!ret) {
                 printf("failure: error loading the configuration\n");