Remove all d_fprintf-s from libnet_conf.c

Replacing them buy DEBUG statements and filling in
d_fprintfs in callers in net_conf.c.

Michael
(This used to be commit 1f0122d8d4ec0f67eaedd5df7383c1b45f37290f)

diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 1069abcfbdff8e5e9aa2615d825ddcc751bfaeef..a637aedbbc6b07707c6edcd7c00f70018ddf9fe4 100644 (file)
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -167,12 +167,12 @@ WERROR libnet_smbconf_reg_createkey_internal(TALLOC_CTX *ctx,
        werr = reg_createkey(ctx, create_parent, subkeyname,
                             REG_KEY_WRITE, newkey, &action);
        if (W_ERROR_IS_OK(werr) && (action != REG_CREATED_NEW_KEY)) {
-               d_fprintf(stderr, "Key '%s' already exists.\n", subkeyname);
+               DEBUG(10, ("Key '%s' already exists.\n", subkeyname));
                werr = WERR_ALREADY_EXISTS;
        }
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr, "Error creating key %s: %s\n",
-                        subkeyname, dos_errstr(werr));
+               DEBUG(5, ("Error creating key %s: %s\n",
+                        subkeyname, dos_errstr(werr)));
        }
 
 done:
@@ -198,11 +198,11 @@ WERROR libnet_smbconf_reg_setvalue_internal(struct registry_key *key,
                                                  &canon_valstr))
        {
                if (canon_valname == NULL) {
-                       d_fprintf(stderr, "invalid parameter '%s' given\n",
-                                 valname);
+                       DEBUG(5, ("invalid parameter '%s' given\n",
+                                 valname));
                } else {
-                       d_fprintf(stderr, "invalid value '%s' given for "
-                                 "parameter '%s'\n", valstr, valname);
+                       DEBUG(5, ("invalid value '%s' given for "
+                                 "parameter '%s'\n", valstr, valname));
                }
                werr = WERR_INVALID_PARAM;
                goto done;
@@ -215,16 +215,16 @@ WERROR libnet_smbconf_reg_setvalue_internal(struct registry_key *key,
        val.v.sz.len = strlen(canon_valstr) + 1;
 
        if (registry_smbconf_valname_forbidden(canon_valname)) {
-               d_fprintf(stderr, "Parameter '%s' not allowed in registry.\n",
-                         canon_valname);
+               DEBUG(5, ("Parameter '%s' not allowed in registry.\n",
+                         canon_valname));
                werr = WERR_INVALID_PARAM;
                goto done;
        }
 
        subkeyname = strrchr_m(key->key->name, '\\');
        if ((subkeyname == NULL) || (*(subkeyname +1) == '\0')) {
-               d_fprintf(stderr, "Invalid registry key '%s' given as "
-                         "smbconf section.\n", key->key->name);
+               DEBUG(5, ("Invalid registry key '%s' given as "
+                         "smbconf section.\n", key->key->name));
                werr = WERR_INVALID_PARAM;
                goto done;
        }
@@ -232,19 +232,18 @@ WERROR libnet_smbconf_reg_setvalue_internal(struct registry_key *key,
        if (!strequal(subkeyname, GLOBAL_NAME) &&
            lp_parameter_is_global(valname))
        {
-               d_fprintf(stderr, "Global paramter '%s' not allowed in "
+               DEBUG(5, ("Global paramter '%s' not allowed in "
                          "service definition ('%s').\n", canon_valname,
-                         subkeyname);
+                         subkeyname));
                werr = WERR_INVALID_PARAM;
                goto done;
        }
 
        werr = reg_setvalue(key, canon_valname, &val);
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr,
-                         "Error adding value '%s' to "
+               DEBUG(5, ("Error adding value '%s' to "
                          "key '%s': %s\n",
-                         canon_valname, key->key->name, dos_errstr(werr));
+                         canon_valname, key->key->name, dos_errstr(werr)));
        }
 
 done:

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 29bbc83ec35bbcfcb0353200a87f31de17adc47b..9503a3c52176510317a8e5e2fe4976e9d8ca2567 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -216,6 +216,8 @@ static int import_process_service(TALLOC_CTX *ctx,
                }
                werr = libnet_smbconf_reg_createkey_internal(tmp_ctx, servicename, &key);
                if (!W_ERROR_IS_OK(werr)) {
+                       d_fprintf(stderr, "Error creating share %s: %s\n",
+                                 servicename, dos_errstr(werr));
                        goto done;
                }
        }
@@ -235,6 +237,10 @@ static int import_process_service(TALLOC_CTX *ctx,
                                werr = libnet_smbconf_reg_setvalue_internal(key,
                                                        parm->label, valstr);
                                if (!W_ERROR_IS_OK(werr)) {
+                                       d_fprintf(stderr,
+                                                 "Error setting parameter '%s'"
+                                                 ": %s\n", parm->label,
+                                                  dos_errstr(werr));
                                        goto done;
                                }
                        }
@@ -622,31 +628,45 @@ static int net_conf_addshare(int argc, const char **argv)
 
        werr = libnet_smbconf_reg_createkey_internal(NULL, argv[0], &newkey);
        if (!W_ERROR_IS_OK(werr)) {
+               d_fprintf(stderr, "Error creating share %s: %s\n",
+                         argv[0], dos_errstr(werr));
                goto done;
        }
 
        /* add config params as values */
 
        werr = libnet_smbconf_reg_setvalue_internal(newkey, "path", path);
-       if (!W_ERROR_IS_OK(werr))
+       if (!W_ERROR_IS_OK(werr)) {
+               d_fprintf(stderr, "Error setting parameter %s: %s\n",
+                         "path", dos_errstr(werr));
                goto done;
+       }
 
        if (comment != NULL) {
                werr = libnet_smbconf_reg_setvalue_internal(newkey, "comment",
                                                            comment);
-               if (!W_ERROR_IS_OK(werr))
+               if (!W_ERROR_IS_OK(werr)) {
+                       d_fprintf(stderr, "Error setting parameter %s: %s\n",
+                                 "comment", dos_errstr(werr));
                        goto done;
+               }
        }
 
        werr = libnet_smbconf_reg_setvalue_internal(newkey, "guest ok",
                                                    guest_ok);
-       if (!W_ERROR_IS_OK(werr))
+       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_reg_setvalue_internal(newkey, "writeable",
                                                    writeable);
-       if (!W_ERROR_IS_OK(werr))
+       if (!W_ERROR_IS_OK(werr)) {
+               d_fprintf(stderr, "Error setting parameter %s: %s\n",
+                         "writeable", dos_errstr(werr));
                goto done;
+       }
 
        ret = 0;