Rename libnet_smbconf_setparm() to libnet_conf_set_parameter().

[ira/wip.git] / source / libnet / libnet_conf.c

diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 735fddcfd20e729c9e19281878049608f71e1bf9..ad9ae4994b22f1a5a8d66357ae104a5a0884a591 100644 (file)
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -127,15 +127,15 @@ done:
 /*
  * open the base key KEY_SMBCONF
  */
-static WERROR libnet_smbconf_reg_open_basekey(TALLOC_CTX *ctx,
-                                             uint32 desired_access,
-                                             struct registry_key **key)
+static WERROR libnet_conf_reg_open_base_key(TALLOC_CTX *ctx,
+                                           uint32 desired_access,
+                                           struct registry_key **key)
 {
        return libnet_conf_reg_open_path(ctx, KEY_SMBCONF, desired_access, key);
 }
 
-static bool libnet_smbconf_value_exists(struct registry_key *key,
-                                       const char *param)
+static bool libnet_conf_value_exists(struct registry_key *key,
+                                    const char *param)
 {
        bool ret = false;
        WERROR werr = WERR_OK;
@@ -154,9 +154,9 @@ static bool libnet_smbconf_value_exists(struct registry_key *key,
 /*
  * create a subkey of KEY_SMBCONF
  */
-static WERROR libnet_smbconf_reg_create_service_key(TALLOC_CTX *ctx,
-                                                   const char * subkeyname,
-                                                   struct registry_key **newkey)
+static WERROR libnet_conf_reg_create_service_key(TALLOC_CTX *ctx,
+                                                const char * subkeyname,
+                                                struct registry_key **newkey)
 {
        WERROR werr = WERR_OK;
        struct registry_key *create_parent = NULL;
@@ -171,8 +171,8 @@ static WERROR libnet_smbconf_reg_create_service_key(TALLOC_CTX *ctx,
                goto done;
        }
 
-       werr = libnet_smbconf_reg_open_basekey(create_ctx, REG_KEY_WRITE,
-                                              &create_parent);
+       werr = libnet_conf_reg_open_base_key(create_ctx, REG_KEY_WRITE,
+                                            &create_parent);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -196,9 +196,9 @@ done:
 /*
  * add a value to a key.
  */
-static WERROR libnet_smbconf_reg_set_value(struct registry_key *key,
-                                          const char *valname,
-                                          const char *valstr)
+static WERROR libnet_conf_reg_set_value(struct registry_key *key,
+                                       const char *valname,
+                                       const char *valstr)
 {
        struct registry_value val;
        WERROR werr = WERR_OK;
@@ -270,8 +270,8 @@ done:
  * which are ar stored as REG_SZ values, so the incomplete
  * handling should be ok.
  */
-static char *libnet_smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
-                                                 struct registry_value *value)
+static char *libnet_conf_format_registry_value(TALLOC_CTX *mem_ctx,
+                                              struct registry_value *value)
 {
        char *result = NULL;
 
@@ -311,11 +311,11 @@ static char *libnet_smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
  * Get the values of a key as a list of value names
  * and a list of value strings (ordered)
  */
-static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
-                                           struct registry_key *key,
-                                           uint32_t *num_values,
-                                           char ***value_names,
-                                           char ***value_strings)
+static WERROR libnet_conf_reg_get_values(TALLOC_CTX *mem_ctx,
+                                        struct registry_key *key,
+                                        uint32_t *num_values,
+                                        char ***value_names,
+                                        char ***value_strings)
 {
        TALLOC_CTX *tmp_ctx = NULL;
        WERROR werr = WERR_OK;
@@ -352,8 +352,8 @@ static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
                        goto done;
                }
 
-               valstring = libnet_smbconf_format_registry_value(tmp_ctx,
-                                                                valvalue);
+               valstring = libnet_conf_format_registry_value(tmp_ctx,
+                                                             valvalue);
                werr = libnet_conf_add_string_to_array(tmp_ctx,
                                                       &tmp_valstrings,
                                                       count,
@@ -391,7 +391,7 @@ done:
 /**
  * Drop the whole configuration (restarting empty).
  */
-WERROR libnet_smbconf_drop(void)
+WERROR libnet_conf_drop(void)
 {
        char *path, *p;
        WERROR werr = WERR_OK;
@@ -437,9 +437,9 @@ done:
  *  param_names  : list of lists of parameter names for each share
  *  param_values : list of lists of parameter values for each share
  */
-WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
-                                char ***share_names, uint32_t **num_params,
-                                char ****param_names, char ****param_values)
+WERROR libnet_conf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
+                             char ***share_names, uint32_t **num_params,
+                             char ****param_names, char ****param_values)
 {
        WERROR werr = WERR_OK;
        TALLOC_CTX *tmp_ctx = NULL;
@@ -464,8 +464,8 @@ WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
                goto done;
        }
 
-       werr = libnet_smbconf_get_share_names(tmp_ctx, &tmp_num_shares,
-                                             &tmp_share_names);
+       werr = libnet_conf_get_share_names(tmp_ctx, &tmp_num_shares,
+                                          &tmp_share_names);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -482,10 +482,10 @@ WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
        }
 
        for (count = 0; count < tmp_num_shares; count++) {
-               werr = libnet_smbconf_getshare(mem_ctx, tmp_share_names[count],
-                                              &tmp_num_params[count],
-                                              &tmp_param_names[count],
-                                              &tmp_param_values[count]);
+               werr = libnet_conf_get_share(mem_ctx, tmp_share_names[count],
+                                            &tmp_num_params[count],
+                                            &tmp_param_names[count],
+                                            &tmp_param_values[count]);
                if (!W_ERROR_IS_OK(werr)) {
                        goto done;
                }
@@ -515,8 +515,8 @@ done:
 /**
  * get the list of share names defined in the configuration.
  */
-WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
-                                     char ***share_names)
+WERROR libnet_conf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
+                                  char ***share_names)
 {
        uint32_t count;
        uint32_t added_count = 0;
@@ -538,7 +538,7 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
        }
 
        /* make sure "global" is always listed first */
-       if (libnet_smbconf_share_exists(GLOBAL_NAME)) {
+       if (libnet_conf_share_exists(GLOBAL_NAME)) {
                werr = libnet_conf_add_string_to_array(tmp_ctx,
                                                       &tmp_share_names,
                                                       0, GLOBAL_NAME);
@@ -548,9 +548,8 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
                added_count++;
        }
 
-       werr = libnet_smbconf_reg_open_basekey(tmp_ctx,
-                                              SEC_RIGHTS_ENUM_SUBKEYS,
-                                              &key);
+       werr = libnet_conf_reg_open_base_key(tmp_ctx, SEC_RIGHTS_ENUM_SUBKEYS,
+                                            &key);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -593,7 +592,7 @@ done:
 /**
  * check if a share/service of a given name exists
  */
-bool libnet_smbconf_share_exists(const char *servicename)
+bool libnet_conf_share_exists(const char *servicename)
 {
        bool ret = false;
        WERROR werr = WERR_OK;
@@ -613,18 +612,18 @@ bool libnet_smbconf_share_exists(const char *servicename)
 /**
  * Add a service if it does not already exist.
  */
-WERROR libnet_smbconf_create_share(const char *servicename)
+WERROR libnet_conf_create_share(const char *servicename)
 {
        WERROR werr;
        TALLOC_CTX *mem_ctx = talloc_stackframe();
        struct registry_key *key = NULL;
 
-       if (libnet_smbconf_share_exists(servicename)) {
+       if (libnet_conf_share_exists(servicename)) {
                werr = WERR_ALREADY_EXISTS;
                goto done;
        }
 
-       werr = libnet_smbconf_reg_create_service_key(mem_ctx, servicename, &key);
+       werr = libnet_conf_reg_create_service_key(mem_ctx, servicename, &key);
 
 done:
        TALLOC_FREE(mem_ctx);
@@ -634,9 +633,9 @@ done:
 /**
  * get a definition of a share (service) from configuration.
  */
-WERROR libnet_smbconf_getshare(TALLOC_CTX *mem_ctx, const char *servicename,
-                              uint32_t *num_params, char ***param_names,
-                              char ***param_values)
+WERROR libnet_conf_get_share(TALLOC_CTX *mem_ctx, const char *servicename,
+                            uint32_t *num_params, char ***param_names,
+                            char ***param_values)
 {
        WERROR werr = WERR_OK;
        struct registry_key *key = NULL;
@@ -647,8 +646,8 @@ WERROR libnet_smbconf_getshare(TALLOC_CTX *mem_ctx, const char *servicename,
                goto done;
        }
 
-       werr = libnet_smbconf_reg_get_values(mem_ctx, key, num_params,
-                                            param_names, param_values);
+       werr = libnet_conf_reg_get_values(mem_ctx, key, num_params,
+                                         param_names, param_values);
 
 done:
        TALLOC_FREE(key);
@@ -658,13 +657,13 @@ done:
 /**
  * delete a service from configuration
  */
-WERROR libnet_smbconf_delshare(const char *servicename)
+WERROR libnet_conf_delete_share(const char *servicename)
 {
        WERROR werr = WERR_OK;
        struct registry_key *key = NULL;
        TALLOC_CTX *ctx = talloc_stackframe();
 
-       werr = libnet_smbconf_reg_open_basekey(ctx, REG_KEY_WRITE, &key);
+       werr = libnet_conf_reg_open_base_key(ctx, REG_KEY_WRITE, &key);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -679,15 +678,15 @@ done:
 /**
  * set a configuration parameter to the value provided.
  */
-WERROR libnet_smbconf_setparm(const char *service,
-                             const char *param,
-                             const char *valstr)
+WERROR libnet_conf_set_parameter(const char *service,
+                                const char *param,
+                                const char *valstr)
 {
        WERROR werr;
        struct registry_key *key = NULL;
        TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-       if (!libnet_smbconf_share_exists(service)) {
+       if (!libnet_conf_share_exists(service)) {
                werr = WERR_NO_SUCH_SERVICE;
                goto done;
        }
@@ -698,7 +697,7 @@ WERROR libnet_smbconf_setparm(const char *service,
                goto done;
        }
 
-       werr = libnet_smbconf_reg_set_value(key, param, valstr);
+       werr = libnet_conf_reg_set_value(key, param, valstr);
 
 done:
        TALLOC_FREE(mem_ctx);
@@ -722,7 +721,7 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       if (!libnet_smbconf_share_exists(service)) {
+       if (!libnet_conf_share_exists(service)) {
                werr = WERR_NO_SUCH_SERVICE;
                goto done;
        }
@@ -733,7 +732,7 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       if (!libnet_smbconf_value_exists(key, param)) {
+       if (!libnet_conf_value_exists(key, param)) {
                werr = WERR_INVALID_PARAM;
                goto done;
        }
@@ -743,7 +742,7 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       *valstr = libnet_smbconf_format_registry_value(mem_ctx, value);
+       *valstr = libnet_conf_format_registry_value(mem_ctx, value);
 
        if (*valstr == NULL) {
                werr = WERR_NOMEM;
@@ -765,7 +764,7 @@ WERROR libnet_smbconf_delparm(const char *service,
        WERROR werr = WERR_OK;
        TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-       if (!libnet_smbconf_share_exists(service)) {
+       if (!libnet_conf_share_exists(service)) {
                return WERR_NO_SUCH_SERVICE;
        }
 
@@ -775,7 +774,7 @@ WERROR libnet_smbconf_delparm(const char *service,
                goto done;
        }
 
-       if (!libnet_smbconf_value_exists(key, param)) {
+       if (!libnet_conf_value_exists(key, param)) {
                werr = WERR_INVALID_PARAM;
                goto done;
        }
@@ -797,6 +796,6 @@ done:
 WERROR libnet_smbconf_set_global_param(const char *param,
                                       const char *val)
 {
-       return libnet_smbconf_setparm(GLOBAL_NAME, param, val);
+       return libnet_conf_set_parameter(GLOBAL_NAME, param, val);
 }