Rename libnet_smbconf_setparm() to libnet_conf_set_parameter().

Michael

diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 0f11bbbc49ce4b61b0d0cddbec2235bc42e6eada..ad9ae4994b22f1a5a8d66357ae104a5a0884a591 100644 (file)
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -678,9 +678,9 @@ done:
 /**
  * set a configuration parameter to the value provided.
  */
 /**
  * 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;
 {
        WERROR werr;
        struct registry_key *key = NULL;


@@ -796,6 +796,6 @@ done:
 WERROR libnet_smbconf_set_global_param(const char *param,
                                       const char *val)
 {
 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);

 }
 
 }
 

diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 340cb375414e149029f551ef790d4af73bbf0b8b..c8de6a555bb044d8169a871530e6ed7fd47ecbf8 100644 (file)
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -229,9 +229,9 @@ static int import_process_service(TALLOC_CTX *ctx,
                        if (opt_testmode) {
                                d_printf("\t%s = %s\n", parm->label, valstr);
                        } else {
                        if (opt_testmode) {
                                d_printf("\t%s = %s\n", parm->label, valstr);
                        } else {

-                               werr = libnet_smbconf_setparm(servicename,
-                                                             parm->label,
-                                                             valstr);
+                               werr = libnet_conf_set_parameter(servicename,
+                                                                parm->label,
+                                                                valstr);

                                if (!W_ERROR_IS_OK(werr)) {
                                        d_fprintf(stderr,
                                                  "Error setting parameter '%s'"
                                if (!W_ERROR_IS_OK(werr)) {
                                        d_fprintf(stderr,
                                                  "Error setting parameter '%s'"


@@ -642,7 +642,7 @@ static int net_conf_addshare(int argc, const char **argv)
         * fill the share with parameters
         */
 
         * fill the share with parameters
         */
 

-       werr = libnet_smbconf_setparm(sharename, "path", path);
+       werr = libnet_conf_set_parameter(sharename, "path", path);

        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "path", dos_errstr(werr));
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "path", dos_errstr(werr));


@@ -650,7 +650,7 @@ static int net_conf_addshare(int argc, const char **argv)
        }
 
        if (comment != NULL) {
        }
 
        if (comment != NULL) {

-               werr = libnet_smbconf_setparm(sharename, "comment", comment);
+               werr = libnet_conf_set_parameter(sharename, "comment", comment);

                if (!W_ERROR_IS_OK(werr)) {
                        d_fprintf(stderr, "Error setting parameter %s: %s\n",
                                  "comment", dos_errstr(werr));
                if (!W_ERROR_IS_OK(werr)) {
                        d_fprintf(stderr, "Error setting parameter %s: %s\n",
                                  "comment", dos_errstr(werr));


@@ -658,14 +658,14 @@ static int net_conf_addshare(int argc, const char **argv)
                }
        }
 
                }
        }
 

-       werr = libnet_smbconf_setparm(sharename, "guest ok", guest_ok);
+       werr = libnet_conf_set_parameter(sharename, "guest ok", guest_ok);

        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "'guest ok'", dos_errstr(werr));
                goto done;
        }
 
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "'guest ok'", dos_errstr(werr));
                goto done;
        }
 

-       werr = libnet_smbconf_setparm(sharename, "writeable", writeable);
+       werr = libnet_conf_set_parameter(sharename, "writeable", writeable);

        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "writeable", dos_errstr(werr));
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting parameter %s: %s\n",
                          "writeable", dos_errstr(werr));


@@ -719,7 +719,7 @@ static int net_conf_setparm(int argc, const char **argv)
        param = strdup_lower(argv[1]);
        value_str = argv[2];
 
        param = strdup_lower(argv[1]);
        value_str = argv[2];
 

-       werr = libnet_smbconf_setparm(service, param, value_str);
+       werr = libnet_conf_set_parameter(service, param, value_str);

 
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting value '%s': %s\n",
 
        if (!W_ERROR_IS_OK(werr)) {
                d_fprintf(stderr, "Error setting value '%s': %s\n",