r11404: Another torture test and a new WERR.

Andrew Bartlett

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 8fe5f2cf6cb7569d32943f8c1f56995899e00151..5b8ff1dd3de6eddffc50606fff49705f300a9be0 100644 (file)
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -187,6 +187,7 @@
 #define WERR_NO_MORE_ITEMS W_ERROR(259)
 #define WERR_MORE_DATA W_ERROR(234)
 #define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
+#define WERR_INVALID_COMPUTERNAME W_ERROR(1210)
 #define WERR_INVALID_DOMAINNAME W_ERROR(1212)
 #define WERR_UNKNOWN_REVISION W_ERROR(1305)
 #define WERR_REVISION_MISMATCH W_ERROR(1306)

diff --git a/source/libcli/util/doserr.c b/source/libcli/util/doserr.c
index a32da5a880abb2c901254dfc9b5374de8ece3377..e1ef9d930a6a400a7cb587c6c03380b01ada2bc6 100644 (file)
--- a/source/libcli/util/doserr.c
+++ b/source/libcli/util/doserr.c
@@ -72,6 +72,7 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_UNKNOWN_REVISION", WERR_UNKNOWN_REVISION },
        { "WERR_REVISION_MISMATCH", WERR_REVISION_MISMATCH },
        { "WERR_INVALID_OWNER", WERR_INVALID_OWNER },
+       { "WERR_INVALID_COMPUTERNAME", WERR_INVALID_COMPUTERNAME },
        { "WERR_INVALID_DOMAINNAME", WERR_INVALID_DOMAINNAME },
        { "WERR_NO_SUCH_USER", WERR_NO_SUCH_USER },
        { "WERR_NO_SUCH_DOMAIN", WERR_NO_SUCH_DOMAIN },

diff --git a/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index 8993969098b42a2572f553fa699af224b4b989e5..a02f670439ceee28f6a1059995be87f48a32d666 100644 (file)
--- a/source/torture/rpc/netlogon.c
+++ b/source/torture/rpc/netlogon.c
@@ -1136,6 +1136,19 @@ static BOOL test_netr_DsRGetSiteName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        ret = False;
                }
        }
+       r.in.computer_name              = talloc_asprintf(mem_ctx, "\\\\%s", computer_name);
+       printf("Testing netr_DsRGetSiteName with broken computer name: %s\n", r.in.computer_name);
+
+       status = dcerpc_netr_DsRGetSiteName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("netr_DsRGetSiteName - %s\n", 
+                      nt_errstr(status));
+               ret = False;
+       } else if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_COMPUTERNAME)) {
+               printf("netr_DsRGetSiteName - incorrect error return %s, expected %s\n", 
+                      win_errstr(r.out.result), win_errstr(WERR_INVALID_COMPUTERNAME));
+               ret = False;
+       }
        return ret;
 }