werror: removed WERR_SETUP_ALREADY_JOINED

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index ee28b35465d38586bef6d6ed2c6e8785c9790d79..effe840338bf25247409063c9a36c4f579e1c203 100644 (file)
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -55,7 +55,6 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_INVALID_FORM_SIZE", WERR_INVALID_FORM_SIZE },
        { "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
        { "WERR_SETUP_NOT_JOINED", WERR_SETUP_NOT_JOINED },
-       { "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 },
@@ -2676,7 +2675,6 @@ const struct werror_str_struct dos_err_strs[] = {
        { WERR_NO_SUCH_LOGON_SESSION, "No such logon session" },
        { WERR_DOMAIN_CONTROLLER_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_PASSWORD_MUST_CHANGE, "The password must be changed" },

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 9cde12c006a97ad3c3678630887683f201647239..f4755a72f9aca8460a6c1c3552f4679a836a6c7a 100644 (file)
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -195,7 +195,6 @@ typedef uint32_t WERROR;
 #define MAX_NERR (NERR_BASE+899)
 #endif
 
-#define WERR_SETUP_ALREADY_JOINED      W_ERROR(0x00000A83)
 #define WERR_SETUP_NOT_JOINED          W_ERROR(0x00000A84)
 #define WERR_SETUP_DOMAIN_CONTROLLER   W_ERROR(0x00000A85)
 #define WERR_DEFAULT_JOIN_REQUIRED     W_ERROR(0x00000A86)