[SCM] Samba Shared Repository - branch master updated -
7ec720af714fab17fcbba3febff0c162775c8186
Jelmer Vernooij
jelmer at samba.org
Sat Nov 1 16:31:31 GMT 2008
The branch, master has been updated
via 7ec720af714fab17fcbba3febff0c162775c8186 (commit)
via ddcab787c408824ff753b929abd2240bc088451d (commit)
from edb7ac69cf739f4f266870adec4a7e51787d9ca8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7ec720af714fab17fcbba3febff0c162775c8186
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 17:28:16 2008 +0100
Use shared doserr.c.
commit ddcab787c408824ff753b929abd2240bc088451d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 1 17:19:26 2008 +0100
Rename dos_errstr() to win_errstr() for consistency with Samba 4.
-----------------------------------------------------------------------
Summary of changes:
libcli/util/doserr.c | 87 +++++++++++++++
libcli/util/werror.h | 1 +
source3/Makefile.in | 2 +-
source3/include/proto.h | 6 -
source3/lib/smbconf/smbconf_reg.c | 10 +-
source3/lib/smbconf/testsuite.c | 18 ++--
source3/libads/ldap_printer.c | 6 +-
source3/libgpo/gpext/gpext.c | 2 +-
source3/libgpo/gpext/registry.c | 4 +-
source3/libgpo/gpext/scripts.c | 2 +-
source3/libgpo/gpo_reg.c | 20 ++--
source3/libsmb/doserr.c | 202 ----------------------------------
source3/param/loadparm.c | 2 +-
source3/printing/nt_printing.c | 4 +-
source3/registry/reg_api.c | 2 +-
source3/registry/reg_backend_db.c | 2 +-
source3/registry/reg_init_basic.c | 4 +-
source3/registry/reg_init_smbconf.c | 4 +-
source3/rpc_parse/parse_prs.c | 2 +-
source3/rpc_server/srv_eventlog_nt.c | 6 +-
source3/rpc_server/srv_spoolss_nt.c | 22 ++--
source3/rpc_server/srv_wkssvc_nt.c | 4 +-
source3/rpcclient/cmd_netlogon.c | 2 +-
source3/rpcclient/cmd_spoolss.c | 14 +-
source3/rpcclient/rpcclient.c | 2 +-
source3/services/services_db.c | 16 ++--
source3/utils/net_ads_gpo.c | 4 +-
source3/utils/net_conf.c | 34 +++---
source3/utils/net_registry.c | 30 +++---
source3/utils/net_rpc.c | 6 +-
source3/utils/net_rpc_printer.c | 28 +++---
source3/utils/net_rpc_service.c | 32 +++---
source3/winbindd/winbindd_cm.c | 2 +-
source3/winbindd/winbindd_misc.c | 2 +-
34 files changed, 232 insertions(+), 352 deletions(-)
delete mode 100644 source3/libsmb/doserr.c
Changeset truncated at 500 lines:
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index be33ba4..2ab3912 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -37,6 +37,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_BAD_NET_RESP", WERR_BAD_NET_RESP },
{ "WERR_UNEXP_NET_ERR", WERR_UNEXP_NET_ERR },
{ "WERR_INSUFFICIENT_BUFFER", WERR_INSUFFICIENT_BUFFER },
+ { "WERR_SEM_TIMEOUT", WERR_SEM_TIMEOUT },
{ "WERR_NO_SUCH_SHARE", WERR_NO_SUCH_SHARE },
{ "WERR_FILE_EXISTS", WERR_FILE_EXISTS },
{ "WERR_INVALID_PARAM", WERR_INVALID_PARAM },
@@ -61,6 +62,8 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_BUF_TOO_SMALL", WERR_BUF_TOO_SMALL },
{ "WERR_JOB_NOT_FOUND", WERR_JOB_NOT_FOUND },
{ "WERR_DEST_NOT_FOUND", WERR_DEST_NOT_FOUND },
+ { "WERR_GROUP_NOT_FOUND", WERR_GROUP_NOT_FOUND },
+ { "WERR_USER_NOT_FOUND", WERR_USER_NOT_FOUND },
{ "WERR_NOT_LOCAL_DOMAIN", WERR_NOT_LOCAL_DOMAIN },
{ "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
{ "WERR_TIME_DIFF_AT_DC", WERR_TIME_DIFF_AT_DC },
@@ -68,6 +71,16 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_SETUP_ALREADY_JOINED", WERR_SETUP_ALREADY_JOINED },
{ "WERR_SETUP_DOMAIN_CONTROLLER", WERR_SETUP_DOMAIN_CONTROLLER },
{ "WERR_DEVICE_NOT_AVAILABLE", WERR_DEVICE_NOT_AVAILABLE },
+ { "WERR_DEFAULT_JOIN_REQUIRED", WERR_DEFAULT_JOIN_REQUIRED },
+ { "WERR_USER_EXISTS", WERR_USER_EXISTS },
+ { "WERR_REVISION_MISMATCH", WERR_REVISION_MISMATCH },
+ { "WERR_NO_LOGON_SERVERS", WERR_NO_LOGON_SERVERS },
+ { "WERR_NO_SUCH_LOGON_SESSION", WERR_NO_SUCH_LOGON_SESSION },
+ { "WERR_USER_ALREADY_EXISTS", WERR_USER_ALREADY_EXISTS },
+ { "WERR_NO_SUCH_USER", WERR_NO_SUCH_USER },
+ { "WERR_GROUP_EXISTS", WERR_GROUP_EXISTS },
+ { "WERR_MEMBER_IN_GROUP", WERR_MEMBER_IN_GROUP },
+ { "WERR_USER_NOT_IN_GROUP", WERR_USER_NOT_IN_GROUP },
{ "WERR_PRINTER_DRIVER_IN_USE", WERR_PRINTER_DRIVER_IN_USE },
{ "WERR_STATUS_MORE_ENTRIES", WERR_STATUS_MORE_ENTRIES },
{ "WERR_NET_NAME_NOT_FOUND", WERR_NET_NAME_NOT_FOUND },
@@ -85,6 +98,8 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_INVALID_OWNER", WERR_INVALID_OWNER },
{ "WERR_INVALID_COMPUTERNAME", WERR_INVALID_COMPUTERNAME },
{ "WERR_INVALID_DOMAINNAME", WERR_INVALID_DOMAINNAME },
+ { "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED },
+ { "WERR_DC_NOT_FOUND", WERR_DC_NOT_FOUND },
{ "WERR_NO_LOGON_SERVERS", WERR_NO_LOGON_SERVERS },
{ "WERR_NO_SUCH_LOGON_SESSION", WERR_NO_SUCH_LOGON_SESSION },
{ "WERR_NO_SUCH_PRIVILEGE", WERR_NO_SUCH_PRIVILEGE },
@@ -134,6 +149,24 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_RPC_E_REMOTE_DISABLED", WERR_RPC_E_REMOTE_DISABLED },
{ "WERR_NOT_CONNECTED", WERR_NOT_CONNECTED },
{ "WERR_NAME_NOT_FOUND", WERR_NAME_NOT_FOUND},
+ { "WERR_NONE_MAPPED", WERR_NONE_MAPPED },
+ { "WERR_INVALID_DOMAIN_STATE", WERR_INVALID_DOMAIN_STATE },
+ { "WERR_SPECIAL_ACCOUNT", WERR_SPECIAL_ACCOUNT },
+ { "WERR_ALIAS_EXISTS", WERR_ALIAS_EXISTS },
+ { "WERR_NO_SUCH_ALIAS", WERR_NO_SUCH_ALIAS },
+ { "WERR_MEMBER_IN_ALIAS", WERR_MEMBER_IN_ALIAS },
+ { "WERR_TIME_SKEW", WERR_TIME_SKEW },
+ { "WERR_IO_PENDING", WERR_IO_PENDING },
+ { "WERR_INVALID_SERVICE_CONTROL", WERR_INVALID_SERVICE_CONTROL },
+ { "WERR_SERVICE_ALREADY_RUNNING", WERR_SERVICE_ALREADY_RUNNING },
+ { "WERR_REG_CORRUPT", WERR_REG_CORRUPT },
+ { "WERR_REG_IO_FAILURE", WERR_REG_IO_FAILURE },
+ { "WERR_REG_FILE_INVALID", WERR_REG_FILE_INVALID },
+ { "WERR_NO_SUCH_SERVICE", WERR_NO_SUCH_SERVICE },
+ { "WERR_SERVICE_DISABLED", WERR_SERVICE_DISABLED },
+ { "WERR_SERVICE_NEVER_STARTED", WERR_SERVICE_NEVER_STARTED },
+ { "WERR_PASSWORD_MUST_CHANGE", WERR_PASSWORD_MUST_CHANGE },
+ { "WERR_ACCOUNT_LOCKED_OUT", WERR_ACCOUNT_LOCKED_OUT },
{ NULL, W_ERROR(0) }
};
@@ -161,3 +194,57 @@ const char *win_errstr(WERROR werror)
return msg;
}
+
+struct werror_str_struct {
+ WERROR werror;
+ const char *friendly_errstr;
+};
+
+const struct werror_str_struct dos_err_strs[] = {
+ { WERR_OK, "Success" },
+ { WERR_ACCESS_DENIED, "Access is denied" },
+ { WERR_INVALID_PARAM, "Invalid parameter" },
+ { WERR_NOT_SUPPORTED, "Not supported" },
+ { WERR_BAD_PASSWORD, "A bad password was supplied" },
+ { WERR_NOMEM, "Out of memory" },
+ { WERR_NO_LOGON_SERVERS, "No logon servers found" },
+ { WERR_NO_SUCH_LOGON_SESSION, "No such logon session" },
+ { WERR_DOMAIN_CONTROLLER_NOT_FOUND, "A domain controller could not be found" },
+ { WERR_DC_NOT_FOUND, "A domain controller could not be found" },
+ { WERR_SETUP_NOT_JOINED, "Join failed" },
+ { WERR_SETUP_ALREADY_JOINED, "Machine is already joined" },
+ { WERR_SETUP_DOMAIN_CONTROLLER, "Machine is a Domain Controller" },
+ { WERR_LOGON_FAILURE, "Invalid logon credentials" },
+ { WERR_USER_EXISTS, "User account already exists" },
+ { WERR_PASSWORD_MUST_CHANGE, "The password must be changed" },
+ { WERR_ACCOUNT_LOCKED_OUT, "Account locked out" },
+ { WERR_TIME_SKEW, "Time difference between client and server" },
+ { WERR_USER_ALREADY_EXISTS, "User already exists" },
+ { WERR_PASSWORD_RESTRICTION, "Password does not meet restrictions" },
+ { WERR_NONE_MAPPED, "Could not map names to SIDs" },
+ { WERR_NO_SUCH_USER, "No such User" },
+ { WERR_GROUP_EXISTS, "Group already exists" },
+ { WERR_DS_DRA_BAD_DN, "An invalid distinguished name was specified for this replication" },
+ { WERR_DS_DRA_BAD_NC, "An invalid naming context was specified for this replication operation" },
+ { WERR_WRONG_PASSWORD, "The current password is incorrect" }
+};
+
+
+
+/*****************************************************************************
+ Get friendly error string for WERRORs
+ *****************************************************************************/
+
+const char *get_friendly_werror_msg(WERROR werror)
+{
+ int i = 0;
+
+ for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
+ if (W_ERROR_V(dos_err_strs[i].werror) ==
+ W_ERROR_V(werror)) {
+ return dos_err_strs[i].friendly_errstr;
+ }
+ }
+
+ return win_errstr(werror);
+}
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 1ebd5cc..fe819fc 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -258,6 +258,7 @@ typedef uint32_t WERROR;
*****************************************************************************/
const char *win_errstr(WERROR werror);
+const char *get_friendly_werror_msg(WERROR werror);
#endif
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c737b32..94146eb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -404,7 +404,7 @@ LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
libsmb/namequery.o libsmb/conncache.o libads/dns.o
NTERR_OBJ = libsmb/nterr.o
-DOSERR_OBJ = libsmb/doserr.o
+DOSERR_OBJ = ../libcli/util/doserr.o
ERRORMAP_OBJ = libsmb/errormap.o
DCE_RPC_ERR_OBJ = ../librpc/rpc/dcerpc_error.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 91bfc80..43cddba 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2933,12 +2933,6 @@ void netlogon_creds_client_step(struct dcinfo *dc,
const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
-/* The following definitions come from libsmb/doserr.c */
-
-const char *dos_errstr(WERROR werror);
-const char *get_friendly_werror_msg(WERROR werror);
-const char *win_errstr(WERROR werror);
-
/* The following definitions come from libsmb/dsgetdcname.c */
void debug_dsdcinfo_flags(int lvl, uint32_t flags);
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index c509289..cae16ad 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -112,7 +112,7 @@ static WERROR smbconf_reg_open_path(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(5, ("Error opening registry path '%s': %s\n",
- path, dos_errstr(werr)));
+ path, win_errstr(werr)));
}
done:
@@ -212,7 +212,7 @@ static WERROR smbconf_reg_create_service_key(TALLOC_CTX *mem_ctx,
}
if (!W_ERROR_IS_OK(werr)) {
DEBUG(5, ("Error creating key %s: %s\n",
- subkeyname, dos_errstr(werr)));
+ subkeyname, win_errstr(werr)));
}
done:
@@ -283,7 +283,7 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(5, ("Error adding value '%s' to "
"key '%s': %s\n",
- canon_valname, key->key->name, dos_errstr(werr)));
+ canon_valname, key->key->name, win_errstr(werr)));
}
done:
@@ -327,7 +327,7 @@ static WERROR smbconf_reg_set_multi_sz_value(struct registry_key *key,
werr = reg_setvalue(key, valname, value);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(5, ("Error adding value '%s' to key '%s': %s\n",
- valname, key->key->name, dos_errstr(werr)));
+ valname, key->key->name, win_errstr(werr)));
}
done:
@@ -585,7 +585,7 @@ static WERROR smbconf_reg_delete_values(struct registry_key *key)
DEBUG(1, ("smbconf_reg_delete_values: "
"Error enumerating values of %s: %s\n",
key->key->name,
- dos_errstr(werr)));
+ win_errstr(werr)));
goto done;
}
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 100fbe8..edc9a7f 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -45,7 +45,7 @@ static bool test_get_includes(struct smbconf_ctx *ctx)
werr = smbconf_get_global_includes(ctx, mem_ctx,
&num_includes, &includes);
if (!W_ERROR_IS_OK(werr)) {
- printf("failure: get_includes - %s\n", dos_errstr(werr));
+ printf("failure: get_includes - %s\n", win_errstr(werr));
goto done;
}
@@ -80,7 +80,7 @@ static bool test_set_get_includes(struct smbconf_ctx *ctx)
werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: get_set_includes (setting includes) - %s\n",
- dos_errstr(werr));
+ win_errstr(werr));
goto done;
}
@@ -88,7 +88,7 @@ static bool test_set_get_includes(struct smbconf_ctx *ctx)
&get_includes);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: get_set_includes (getting includes) - %s\n",
- dos_errstr(werr));
+ win_errstr(werr));
goto done;
}
@@ -135,14 +135,14 @@ static bool test_delete_includes(struct smbconf_ctx *ctx)
werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: delete_includes (setting includes) - %s\n",
- dos_errstr(werr));
+ win_errstr(werr));
goto done;
}
werr = smbconf_delete_global_includes(ctx);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: delete_includes (deleting includes) - %s\n",
- dos_errstr(werr));
+ win_errstr(werr));
goto done;
}
@@ -150,7 +150,7 @@ static bool test_delete_includes(struct smbconf_ctx *ctx)
&get_includes);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: delete_includes (getting includes) - %s\n",
- dos_errstr(werr));
+ win_errstr(werr));
goto done;
}
@@ -162,7 +162,7 @@ static bool test_delete_includes(struct smbconf_ctx *ctx)
werr = smbconf_delete_global_includes(ctx);
if (!W_ERROR_IS_OK(werr)) {
printf("failuer: delete_includes (delete empty includes) - "
- "%s\n", dos_errstr(werr));
+ "%s\n", win_errstr(werr));
goto done;
}
@@ -214,7 +214,7 @@ static bool torture_smbconf_txt(void)
printf("test: init\n");
werr = smbconf_init_txt(mem_ctx, &conf_ctx, filename);
if (!W_ERROR_IS_OK(werr)) {
- printf("failure: init failed: %s\n", dos_errstr(werr));
+ printf("failure: init failed: %s\n", win_errstr(werr));
ret = false;
goto done;
}
@@ -251,7 +251,7 @@ static bool torture_smbconf_reg(void)
printf("test: init\n");
werr = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
if (!W_ERROR_IS_OK(werr)) {
- printf("failure: init failed: %s\n", dos_errstr(werr));
+ printf("failure: init failed: %s\n", win_errstr(werr));
ret = false;
goto done;
}
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 9935e23..0a42f00 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -309,7 +309,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
&pol);
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, ("Unable to open printer %s, error is %s.\n",
- printername, dos_errstr(result)));
+ printername, win_errstr(result)));
return result;
}
@@ -320,7 +320,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n",
- printername, dos_errstr(result)));
+ printername, win_errstr(result)));
} else {
uint32 num_values = regval_ctr_numvals( dsdriver_ctr );
@@ -337,7 +337,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n",
- printername, dos_errstr(result)));
+ printername, win_errstr(result)));
} else {
uint32 num_values = regval_ctr_numvals( dsspooler_ctr );
diff --git a/source3/libgpo/gpext/gpext.c b/source3/libgpo/gpext/gpext.c
index 2ae9e2c..ee4ce87 100644
--- a/source3/libgpo/gpext/gpext.c
+++ b/source3/libgpo/gpext/gpext.c
@@ -603,7 +603,7 @@ NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx)
werr = gp_extension_store_reg(mem_ctx, reg_ctx, info);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(1,("gp_extension_store_reg failed: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
TALLOC_FREE(info);
gpext->methods->shutdown();
status = werror_to_ntstatus(werr);
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index f501498..0a0dd9b 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -502,7 +502,7 @@ static WERROR reg_apply_registry(TALLOC_CTX *mem_ctx,
token, flags);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("failed to apply registry: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
goto done;
}
}
@@ -554,7 +554,7 @@ static NTSTATUS registry_process_group_policy(ADS_STRUCT *ads,
entries, num_entries);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("failed to apply registry: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
return werror_to_ntstatus(werr);
}
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index 02c3aba..ddea35c 100644
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -311,7 +311,7 @@ static WERROR scripts_apply(TALLOC_CTX *mem_ctx,
token, flags);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("failed to apply registry: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
goto done;
}
}
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index d493150..3d385de 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -466,13 +466,13 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
werr = gp_secure_key(mem_ctx, flags, reg_ctx->curr_key,
&token->user_sids[0]);
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(0,("failed to secure key: %s\n", dos_errstr(werr)));
+ DEBUG(0,("failed to secure key: %s\n", win_errstr(werr)));
goto done;
}
werr = gp_reg_store_groupmembership(mem_ctx, reg_ctx, token, flags);
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(0,("failed to store group membership: %s\n", dos_errstr(werr)));
+ DEBUG(0,("failed to store group membership: %s\n", win_errstr(werr)));
goto done;
}
@@ -484,7 +484,7 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
werr = gp_del_reg_state(mem_ctx, reg_ctx->curr_key, subkeyname);
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(0,("failed to delete old state: %s\n", dos_errstr(werr)));
+ DEBUG(0,("failed to delete old state: %s\n", win_errstr(werr)));
/* goto done; */
}
@@ -534,7 +534,7 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("gp_reg_state_store: "
"gpo_store_reg_gpovals failed for %s: %s\n",
- gpo->display_name, dos_errstr(werr)));
+ gpo->display_name, win_errstr(werr)));
goto done;
}
}
@@ -663,7 +663,7 @@ WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("gp_reg_state_read: "
"gp_read_reg_subkey gave: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
goto done;
}
@@ -941,7 +941,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
root_key, &key);
/* reg_ctx->curr_key, &key); */
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(0,("gp_store_reg_subkey failed: %s\n", dos_errstr(werr)));
+ DEBUG(0,("gp_store_reg_subkey failed: %s\n", win_errstr(werr)));
return werr;
}
@@ -957,7 +957,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("reg_apply_registry_entry: "
"gp_secure_key failed: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
return werr;
}
break;
@@ -966,7 +966,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("reg_apply_registry_entry: "
"reg_setvalue failed: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
dump_reg_entry(flags, "STORE", entry);
return werr;
}
@@ -976,7 +976,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("reg_apply_registry_entry: "
"reg_deletevalue failed: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
dump_reg_entry(flags, "STORE", entry);
return werr;
}
@@ -986,7 +986,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("reg_apply_registry_entry: "
"reg_deleteallvalues failed: %s\n",
- dos_errstr(werr)));
+ win_errstr(werr)));
dump_reg_entry(flags, "STORE", entry);
return werr;
}
diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
deleted file mode 100644
index 0cccae1..0000000
--- a/source3/libsmb/doserr.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * DOS error routines
- * Copyright (C) Tim Potter 2002.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
--
Samba Shared Repository
More information about the samba-cvs
mailing list