summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2009-09-18 00:00:21 +0300
committerAnatoliy Atanasov <anatoliy.atanasov@postpath.com>2009-09-30 15:48:40 +0300
commit948cd70bad6600a4e4e1493469efc0ccd9399c18 (patch)
tree25b03a86625888efbcf3a66f8fe599873811754c
parentd9994a604bd51949a9869927bdc2cb512fba9171 (diff)
downloadsamba-948cd70bad6600a4e4e1493469efc0ccd9399c18.tar.gz
samba-948cd70bad6600a4e4e1493469efc0ccd9399c18.tar.bz2
samba-948cd70bad6600a4e4e1493469efc0ccd9399c18.zip
w32err: WERR_USER_EXISTS replace with WERR_USEREXISTS name
In Win32 we have NERR_UserExists which maps to WERR_USER_EXISTS currently and there is ERROR_USER_EXISTS which maps to WERR_USER_ALREADY_EXISTS Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>
-rw-r--r--libcli/util/doserr.c4
-rw-r--r--libcli/util/werror.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 2d33935d8f..1c1a39f7f9 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -76,7 +76,7 @@ static const struct werror_code_struct dos_errs[] =
{ "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_USEREXISTS", WERR_USEREXISTS },
{ "WERR_REVISION_MISMATCH", WERR_REVISION_MISMATCH },
{ "WERR_NO_LOGON_SERVERS", WERR_NO_LOGON_SERVERS },
{ "WERR_NO_SUCH_LOGON_SESSION", WERR_NO_SUCH_LOGON_SESSION },
@@ -265,7 +265,7 @@ const struct werror_str_struct dos_err_strs[] = {
{ 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_USEREXISTS, "The 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" },
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index c203938aee..fa358c1fda 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -214,7 +214,7 @@ typedef uint32_t WERROR;
#define WERR_DEST_NOT_FOUND W_ERROR(0x00000868)
#define WERR_GROUP_NOT_FOUND W_ERROR(0x000008AC)
#define WERR_USER_NOT_FOUND W_ERROR(0x000008AD)
-#define WERR_USER_EXISTS W_ERROR(0x000008B0)
+#define WERR_USEREXISTS W_ERROR(0x000008B0)
#define WERR_NOT_CONNECTED W_ERROR(0x000008CA)
#define WERR_NAME_NOT_FOUND W_ERROR(0x000008E1)
#define WERR_NET_NAME_NOT_FOUND W_ERROR(0x00000906)