w32err: WERR_DC_NOT_FOUND replaced with WERR_DCNOTFOUND

It turns out in win32 ERROR_DC_NOT_FOUND exists and it is
an error for Device Context (DC), not Domain Controller

Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 5e741384677e8cd477380687c3caf65642806217..2d33935d8ff2a722eca5b6c4cc9d3018eddb39b9 100644 (file)
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -105,7 +105,7 @@ static const struct werror_code_struct dos_errs[] =
        { "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_DCNOTFOUND", WERR_DCNOTFOUND },
        { "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 },
@@ -260,7 +260,7 @@ const struct werror_str_struct dos_err_strs[] = {
        { 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_DCNOTFOUND, "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" },

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index c04ffd8031e6a0d179aef47043909e3f84e2c749..c203938aeee464c57e683e522bd06f1af685ec60 100644 (file)
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -222,7 +222,7 @@ typedef uint32_t WERROR;
 #define WERR_DEVICE_NOT_SHARED         W_ERROR(0x00000907)
 #define WERR_FID_NOT_FOUND             W_ERROR(0x0000090A)
 #define WERR_NOT_LOCAL_DOMAIN          W_ERROR(0x00000910)
-#define WERR_DC_NOT_FOUND              W_ERROR(0x00000995)
+#define WERR_DCNOTFOUND                        W_ERROR(0x00000995)
 #define WERR_TIME_DIFF_AT_DC           W_ERROR(0x00000999)
 #define WERR_DFS_NO_SUCH_VOL           W_ERROR(0x00000A66)
 #define WERR_DFS_NO_SUCH_SHARE         W_ERROR(0x00000A69)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index cd476868e302c2d6c4b57b85a2d473d6140dee4a..8c3030711bf55d012066f68fe941cd381a24494e 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1828,7 +1828,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
                                "failed to find DC for domain %s",
                                r->in.domain_name,
                                get_friendly_nt_error_msg(status));
-                       return WERR_DC_NOT_FOUND;
+                       return WERR_DCNOTFOUND;
                }
 
                dc = strip_hostname(info->dc_unc);
@@ -2019,7 +2019,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
                                "failed to find DC for domain %s",
                                r->in.domain_name,
                                get_friendly_nt_error_msg(status));
-                       return WERR_DC_NOT_FOUND;
+                       return WERR_DCNOTFOUND;
                }
 
                dc = strip_hostname(info->dc_unc);