The branch, v3-2-test has been updated
via 332be113a775adce8108a8003682019ae7f5bc21 (commit)
via 7bac935b65565099c0dfb34cab0dec73dd5fb479 (commit)
via 1f0122d8d4ec0f67eaedd5df7383c1b45f37290f (commit)
from 5b4b335ed0d1dc738f1f099e5c638361f3aede07 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 332be113a775adce8108a8003682019ae7f5bc21
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 30 22:30:21 2007 +0100
Remove an unused variable.
Michael
commit 7bac935b65565099c0dfb34cab0dec73dd5fb479
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 30 22:29:54 2007 +0100
Remove an unused variable.
Michael
commit 1f0122d8d4ec0f67eaedd5df7383c1b45f37290f
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 30 22:27:45 2007 +0100
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
-----------------------------------------------------------------------
Summary of changes:
source/libnet/libnet_conf.c | 32 +++++++++++++++-----------------
source/utils/net_conf.c | 29 ++++++++++++++++++++++++-----
2 files changed, 39 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 1069abc..8fe2c76 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -36,7 +36,6 @@ static WERROR libnet_smbconf_add_string_to_array(TALLOC_CTX
*mem_ctx,
uint32_t count,
const char *string)
{
- WERROR werr = WERR_OK;
char **new_array = NULL;
if ((array == NULL) || (string == NULL)) {
@@ -167,12 +166,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 +197,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 +214,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 +231,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/source/utils/net_conf.c b/source/utils/net_conf.c
index 29bbc83..98e6b60 100644
--- a/source/utils/net_conf.c
+++ b/source/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;
}
}
@@ -462,7 +468,6 @@ static int net_conf_showshare(int argc, const char **argv)
{
int ret = -1;
WERROR werr = WERR_OK;
- struct registry_key *key = NULL;
const char *sharename = NULL;
TALLOC_CTX *ctx;
uint32_t num_params;
@@ -622,31 +627,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;
--
Samba Shared Repository
