r9727: A simplier test I can aim at passing when I get the cracknames code done.
[kai/samba.git] / source / torture / rpc / drsuapi.c
index 562291c6de37b48537568b242604f054c7da4c65..4e72a0f9b35003c753ff7748ab19b776c8cf5f13 100644 (file)
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
 
-#define TEST_MACHINE_NAME "torturetest"
+struct DsPrivate {
+       struct policy_handle bind_handle;
+       struct GUID bind_guid;
+       const char *domain_obj_dn;
+       const char *domain_guid_str;
+       const char *domain_dns_name;
+       struct GUID domain_guid;
+       struct drsuapi_DsGetDCInfo2 dcinfo;
+};
 
 static BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                     struct policy_handle *bind_handle)
+                     struct DsPrivate *priv)
 {
        NTSTATUS status;
        struct drsuapi_DsBind r;
        BOOL ret = True;
 
-       ZERO_STRUCT(r);
-       r.out.bind_handle = bind_handle;
+       GUID_from_string(DRSUAPI_DS_BIND_GUID, &priv->bind_guid);
+
+       r.in.bind_guid = &priv->bind_guid;
+       r.in.bind_info = NULL;
+       r.out.bind_handle = &priv->bind_handle;
+
+       printf("testing DsBind\n");
 
        status = dcerpc_drsuapi_DsBind(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -41,15 +55,175 @@ static BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsBind failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsBind failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsBind failed - %s\n", win_errstr(r.out.result));
                ret = False;
        }
 
        return ret;
 }
 
+static BOOL test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                   struct DsPrivate *priv, const char *dn,
+                                   const char *user_principal_name, const char *service_principal_name)
+{
+       
+
+       NTSTATUS status;
+       BOOL ret = True;
+       struct drsuapi_DsCrackNames r;
+       struct drsuapi_DsNameString names[1];
+       enum drsuapi_DsNameFormat formats[] = {
+               DRSUAPI_DS_NAME_FORMAT_FQDN_1779,
+               DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+               DRSUAPI_DS_NAME_FORMAT_DISPLAY,
+               DRSUAPI_DS_NAME_FORMAT_GUID,
+               DRSUAPI_DS_NAME_FORMAT_CANONICAL,
+               DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL,
+               DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX,
+               DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL,
+               DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
+               DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN
+       };
+       int i, j;
+
+       const char *n_matrix[ARRAY_SIZE(formats)][ARRAY_SIZE(formats)];
+       const char *n_from[ARRAY_SIZE(formats)];
+
+       ZERO_STRUCT(r);
+       r.in.bind_handle                = &priv->bind_handle;
+       r.in.level                      = 1;
+       r.in.req.req1.unknown1          = 0x000004e4;
+       r.in.req.req1.unknown2          = 0x00000407;
+       r.in.req.req1.count             = 1;
+       r.in.req.req1.names             = names;
+       r.in.req.req1.format_flags      = DRSUAPI_DS_NAME_FLAG_NO_FLAGS;
+
+       n_matrix[0][0] = dn;
+
+       for (i = 0; i < ARRAY_SIZE(formats); i++) {
+               r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+               r.in.req.req1.format_desired    = formats[i];
+               names[0].str = dn;
+               printf("testing DsCrackNames (matrix prep) with name '%s' from format: %d desired format:%d ",
+                      names[0].str, r.in.req.req1.format_offered, r.in.req.req1.format_desired);
+               
+               status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       const char *errstr = nt_errstr(status);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                               errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                       }
+                       printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+                       ret = False;
+               } else if (!W_ERROR_IS_OK(r.out.result)) {
+                       printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+                       ret = False;
+               }
+                       
+               if (!ret) {
+                       return ret;
+               }
+               switch (formats[i]) {
+               case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL:
+               case DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL:  
+               case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY: 
+               case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN: 
+                       if (r.out.ctr.ctr1->array[0].status == DRSUAPI_DS_NAME_STATUS_OK) {
+                               printf("Unexpected success: This name lookup should fail\n");
+                               return False;
+                       }
+                       printf ("(expected) error\n");
+                       break;
+               default:
+                       if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+                               printf("Error: %d\n", r.out.ctr.ctr1->array[0].status);
+                               return False;
+                       }
+               }
+
+               switch (formats[i]) {
+               case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL:
+                       n_from[i] = user_principal_name;
+                       break;
+               case DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL:  
+                       n_from[i] = service_principal_name;
+                       break;
+               case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY: 
+               case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN: 
+                       n_from[i] = NULL;
+                       break;
+               default:
+                       n_from[i] = r.out.ctr.ctr1->array[0].result_name;
+                       printf("%s\n", n_from[i]);
+               }
+       }
+
+       for (i = 0; i < ARRAY_SIZE(formats); i++) {
+               for (j = 0; j < ARRAY_SIZE(formats); j++) {
+                       r.in.req.req1.format_offered    = formats[i];
+                       r.in.req.req1.format_desired    = formats[j];
+                       if (!n_from[i]) {
+                               n_matrix[i][j] = NULL;
+                               continue;
+                       }
+                       names[0].str = n_from[i];
+                       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               const char *errstr = nt_errstr(status);
+                               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                               }
+                               printf("testing DsCrackNames (matrix) with name '%s' from format: %d desired format:%d failed - %s",
+                                      names[0].str, r.in.req.req1.format_offered, r.in.req.req1.format_desired, errstr);
+                               ret = False;
+                       } else if (!W_ERROR_IS_OK(r.out.result)) {
+                               printf("testing DsCrackNames (matrix) with name '%s' from format: %d desired format:%d failed - %s",
+                                      names[0].str, r.in.req.req1.format_offered, r.in.req.req1.format_desired, 
+                                      win_errstr(r.out.result));
+                               ret = False;
+                       }
+                       
+                       if (!ret) {
+                               return ret;
+                       }
+                       if (r.out.ctr.ctr1->array[0].status == DRSUAPI_DS_NAME_STATUS_OK) {
+                               n_matrix[i][j] = r.out.ctr.ctr1->array[0].result_name;
+                       } else {
+                               n_matrix[i][j] = NULL;
+                       }
+               }
+       }
+
+       for (i = 0; i < ARRAY_SIZE(formats); i++) {
+               for (j = 0; j < ARRAY_SIZE(formats); j++) {
+                       if (n_matrix[i][j] == n_from[j]) {
+                               
+                       /* We don't have a from name for these yet (and we can't map to them to find it out) */
+                       } else if (n_matrix[i][j] == NULL && n_from[i] == NULL) {
+                               
+                       /* we can't map to these two */
+                       } else if (n_matrix[i][j] == NULL && formats[j] == DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL) {
+                       } else if (n_matrix[i][j] == NULL && formats[j] == DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL) {
+                       } else if (n_matrix[i][j] == NULL && n_from[j] != NULL) {
+                               printf("dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: %s should be %s\n", formats[i], formats[j], n_matrix[i][j], n_from[j]);
+                               ret = False;
+                       } else if (n_matrix[i][j] != NULL && n_from[j] == NULL) {
+                               printf("dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: %s should be %s\n", formats[i], formats[j], n_matrix[i][j], n_from[j]);
+                               ret = False;
+                       } else if (strcmp(n_matrix[i][j], n_from[j]) != 0) {
+                               printf("dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: %s should be %s\n", formats[i], formats[j], n_matrix[i][j], n_from[j]);
+                               ret = False;
+                       }
+               }
+       }
+       return ret;
+}
+
 static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                     struct policy_handle *bind_handle)
+                     struct DsPrivate *priv)
 {
        NTSTATUS status;
        struct drsuapi_DsCrackNames r;
@@ -57,11 +231,12 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        BOOL ret = True;
        const char *dns_domain;
        const char *nt4_domain;
-       const char *FQDN_1779_domain;
        const char *FQDN_1779_name;
+       const char *user_principal_name;
+       const char *service_principal_name;
 
        ZERO_STRUCT(r);
-       r.in.bind_handle                = bind_handle;
+       r.in.bind_handle                = &priv->bind_handle;
        r.in.level                      = 1;
        r.in.req.req1.unknown1          = 0x000004e4;
        r.in.req.req1.unknown2          = 0x00000407;
@@ -73,13 +248,22 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
        names[0].str = talloc_asprintf(mem_ctx, "%s/", lp_realm());
 
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -90,17 +274,83 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        dns_domain = r.out.ctr.ctr1->array[0].dns_domain_name;
        nt4_domain = r.out.ctr.ctr1->array[0].result_name;
 
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_GUID;
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       priv->domain_dns_name = r.out.ctr.ctr1->array[0].dns_domain_name;
+       priv->domain_guid_str = r.out.ctr.ctr1->array[0].result_name;
+       GUID_from_string(priv->domain_guid_str, &priv->domain_guid);
+
+
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_GUID;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
+       names[0].str = priv->domain_guid_str;
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
        r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
        names[0].str = nt4_domain;
 
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -108,11 +358,14 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return ret;
        }
 
-       FQDN_1779_domain = r.out.ctr.ctr1->array[0].result_name;
+       priv->domain_obj_dn = r.out.ctr.ctr1->array[0].result_name;
 
        r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
-       names[0].str = talloc_asprintf(mem_ctx, "%s%s$", nt4_domain, dcerpc_server_name(p));
+       names[0].str = talloc_asprintf(mem_ctx, "%s%s$", nt4_domain, priv->dcinfo.netbios_name);
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
 
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -120,7 +373,13 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -130,17 +389,121 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        FQDN_1779_name = r.out.ctr.ctr1->array[0].result_name;
 
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = talloc_asprintf(mem_ctx, "%s$@%s", priv->dcinfo.netbios_name, dns_domain);
+       user_principal_name = names[0].str;
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       if (strcmp(r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name) != 0) {
+               printf("DsCrackNames failed - %s != %s\n", r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name);
+               return False;
+       }
+
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = talloc_asprintf(mem_ctx, "HOST/%s", priv->dcinfo.netbios_name);
+       service_principal_name = names[0].str;
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       if (strcmp(r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name) != 0) {
+               printf("DsCrackNames failed - %s != %s\n", r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name);
+               return False;
+       }
+
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = talloc_asprintf(mem_ctx, "cifs/%s.%s", priv->dcinfo.netbios_name, dns_domain);
+
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       if (strcmp(r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name) != 0) {
+               printf("DsCrackNames failed - %s != %s\n", r.out.ctr.ctr1->array[0].result_name, FQDN_1779_name);
+               return False;
+       }
+
        r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_CANONICAL;
        names[0].str = FQDN_1779_name;
 
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
                ret = False;
        }
 
@@ -150,13 +513,22 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_DISPLAY;
 
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -166,13 +538,49 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_GUID;
 
+       printf("testing DsCrackNames with name '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_GUID;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = GUID_string2(mem_ctx, &priv->dcinfo.site_guid);
+
+       printf("testing DsCrackNames with Site GUID '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -180,7 +588,11 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return ret;
        }
 
-       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
+       names[0].str = GUID_string2(mem_ctx, &priv->dcinfo.computer_guid);
+
+       printf("testing DsCrackNames with Computer GUID '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
 
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -188,7 +600,13 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -196,7 +614,12 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return ret;
        }
 
-       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL;
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_GUID;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = GUID_string2(mem_ctx, &priv->dcinfo.server_guid);
+
+       printf("testing DsCrackNames with Server GUID '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
 
        status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -204,7 +627,13 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsCrackNames failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
                ret = False;
        }
 
@@ -212,18 +641,608 @@ static BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return ret;
        }
 
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_GUID;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = GUID_string2(mem_ctx, &priv->dcinfo.ntds_guid);
+
+       printf("testing DsCrackNames with NTDS GUID '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames failed on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (!ret) {
+               return ret;
+       }
+
+       /* NEGATIVE test.  This should parse, but not succeed */
+       r.in.req.req1.format_offered    = DRSUAPI_DS_NAME_FORMAT_GUID;
+       r.in.req.req1.format_desired    = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
+       names[0].str = GUID_string2(mem_ctx, &priv->bind_guid);
+
+       printf("testing DsCrackNames with BIND GUID '%s' desired format:%d\n",
+                       names[0].str, r.in.req.req1.format_desired);
+
+       status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsCrackNames failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       } else if (r.out.ctr.ctr1->array[0].status == DRSUAPI_DS_NAME_STATUS_OK) {
+               printf("DsCrackNames succeeded on name - %d\n", r.out.ctr.ctr1->array[0].status);
+               ret = False;
+       }
+
+       if (ret) {
+               return test_DsCrackNamesMatrix(p, mem_ctx, priv, FQDN_1779_name, user_principal_name, service_principal_name);
+       }
+
+       return ret;
+}
+
+static BOOL test_DsGetDCInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                     struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       struct drsuapi_DsGetDomainControllerInfo r;
+       BOOL ret = True;
+
+       r.in.bind_handle = &priv->bind_handle;
+       r.in.level = 1;
+
+       r.in.req.req1.domain_name = talloc_strdup(mem_ctx, lp_realm());
+       r.in.req.req1.level = 1;
+
+       printf("testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+                       r.in.req.req1.level, r.in.req.req1.domain_name);
+
+       status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, win_errstr(r.out.result));
+               ret = False;
+       }
+
+       r.in.req.req1.level = 2;
+
+       printf("testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+                       r.in.req.req1.level, r.in.req.req1.domain_name);
+
+       status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, win_errstr(r.out.result));
+               ret = False;
+       } else {
+               if (r.out.ctr.ctr2.count > 0) {
+                       priv->dcinfo    = r.out.ctr.ctr2.array[0];
+               }
+       }
+
+       r.in.req.req1.level = -1;
+
+       printf("testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+                       r.in.req.req1.level, r.in.req.req1.domain_name);
+
+       status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsGetDomainControllerInfo level %d\n"
+                       "    with dns domain failed - %s\n",
+                       r.in.req.req1.level, win_errstr(r.out.result));
+               ret = False;
+       }
+
+       r.in.req.req1.domain_name = talloc_strdup(mem_ctx, lp_workgroup());
+       r.in.req.req1.level = 2;
+
+       printf("testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+                       r.in.req.req1.level, r.in.req.req1.domain_name);
+
+       status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsGetDomainControllerInfo level %d\n"
+                       "    with netbios domain failed - %s\n",
+                       r.in.req.req1.level, errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsGetDomainControllerInfo level %d\n"
+                       "    with netbios domain failed - %s\n",
+                       r.in.req.req1.level, win_errstr(r.out.result));
+               ret = False;
+       }
+
+       r.in.req.req1.domain_name = "__UNKNOWN_DOMAIN__";
+       r.in.req.req1.level = 2;
+
+       printf("testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
+                       r.in.req.req1.level, r.in.req.req1.domain_name);
+
+       status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsGetDomainControllerInfo level %d\n"
+                       "    with invalid domain failed - %s\n",
+                       r.in.req.req1.level, errstr);
+               ret = False;
+       } else if (!W_ERROR_EQUAL(r.out.result, WERR_DS_OBJ_NOT_FOUND)) {
+               printf("DsGetDomainControllerInfo level %d\n"
+                       "    with invalid domain not expected error (WERR_DS_OBJ_NOT_FOUND) - %s\n",
+                       r.in.req.req1.level, win_errstr(r.out.result));
+               ret = False;
+       }
+
+       return ret;
+}
+
+static BOOL test_DsWriteAccountSpn(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       struct drsuapi_DsWriteAccountSpn r;
+       struct drsuapi_DsNameString names[2];
+       BOOL ret = True;
+
+       r.in.bind_handle                = &priv->bind_handle;
+       r.in.level                      = 1;
+
+       printf("testing DsWriteAccountSpn\n");
+
+       r.in.req.req1.operation = DRSUAPI_DS_SPN_OPERATION_ADD;
+       r.in.req.req1.unknown1  = 0;
+       r.in.req.req1.object_dn = priv->dcinfo.computer_dn;
+       r.in.req.req1.count     = 2;
+       r.in.req.req1.spn_names = names;
+       names[0].str = talloc_asprintf(mem_ctx, "smbtortureSPN/%s",priv->dcinfo.netbios_name);
+       names[1].str = talloc_asprintf(mem_ctx, "smbtortureSPN/%s",priv->dcinfo.dns_name);
+
+       status = dcerpc_drsuapi_DsWriteAccountSpn(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsWriteAccountSpn failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsWriteAccountSpn failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       }
+
+       r.in.req.req1.operation = DRSUAPI_DS_SPN_OPERATION_DELETE;
+       r.in.req.req1.unknown1  = 0;
+
+       status = dcerpc_drsuapi_DsWriteAccountSpn(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("dcerpc_drsuapi_DsWriteAccountSpn failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsWriteAccountSpn failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       }
+
+       return ret;
+}
+
+static BOOL test_DsReplicaGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       struct drsuapi_DsReplicaGetInfo r;
+       BOOL ret = True;
+       int i;
+       struct {
+               int32_t level;
+               int32_t infotype;
+               const char *obj_dn;
+       } array[] = {
+               {       
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_CURSORS,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO,
+                       DRSUAPI_DS_REPLICA_INFO_PENDING_OPS,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_CURSORS2,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_CURSORS3,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04,
+                       "__IGNORED__"
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_CURSURS05,
+                       NULL
+               },{
+                       DRSUAPI_DS_REPLICA_GET_INFO2,
+                       DRSUAPI_DS_REPLICA_INFO_06,
+                       NULL
+               }
+       };
+
+       r.in.bind_handle        = &priv->bind_handle;
+
+       for (i=0; i < ARRAY_SIZE(array); i++) {
+               const char *object_dn;
+
+               printf("testing DsReplicaGetInfo level %d infotype %d\n",
+                       array[i].level, array[i].infotype);
+
+               object_dn = (array[i].obj_dn ? array[i].obj_dn : priv->domain_obj_dn);
+
+               r.in.level = array[i].level;
+               switch(r.in.level) {
+               case DRSUAPI_DS_REPLICA_GET_INFO:
+                       r.in.req.req1.info_type = array[i].infotype;
+                       r.in.req.req1.object_dn = object_dn;
+                       ZERO_STRUCT(r.in.req.req1.guid1);
+                       break;
+               case DRSUAPI_DS_REPLICA_GET_INFO2:
+                       r.in.req.req2.info_type = array[i].infotype;
+                       r.in.req.req2.object_dn = object_dn;
+                       ZERO_STRUCT(r.in.req.req1.guid1);
+                       r.in.req.req2.unknown1  = 0;
+                       r.in.req.req2.string1   = NULL;
+                       r.in.req.req2.string2   = NULL;
+                       r.in.req.req2.unknown2  = 0;
+                       break;
+               }
+
+               status = dcerpc_drsuapi_DsReplicaGetInfo(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       const char *errstr = nt_errstr(status);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                               errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                       }
+                       if (p->last_fault_code != DCERPC_FAULT_INVALID_TAG) {
+                               printf("dcerpc_drsuapi_DsReplicaGetInfo failed - %s\n", errstr);
+                               ret = False;
+                       } else {
+                               printf("DsReplicaGetInfo level %d and/or infotype %d not supported by server\n",
+                                       array[i].level, array[i].infotype);
+                       }
+               } else if (!W_ERROR_IS_OK(r.out.result)) {
+                       printf("DsReplicaGetInfo failed - %s\n", win_errstr(r.out.result));
+                       ret = False;
+               }
+       }
+
+       return ret;
+}
+
+static BOOL test_DsReplicaSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       BOOL ret = True;
+       int i;
+       struct drsuapi_DsReplicaSync r;
+       struct drsuapi_DsReplicaObjectIdentifier nc;
+       struct GUID null_guid;
+       struct dom_sid null_sid;
+       struct {
+               int32_t level;
+       } array[] = {
+               {       
+                       1
+               }
+       };
+
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
+               printf("DsReplicaSync disabled - enable dangerous tests to use\n");
+               return True;
+       }
+
+       ZERO_STRUCT(null_guid);
+       ZERO_STRUCT(null_sid);
+
+       r.in.bind_handle        = &priv->bind_handle;
+
+       for (i=0; i < ARRAY_SIZE(array); i++) {
+               printf("testing DsReplicaSync level %d\n",
+                       array[i].level);
+
+               r.in.level = array[i].level;
+               switch(r.in.level) {
+               case 1:
+                       nc.guid                                 = null_guid;
+                       nc.sid                                  = null_sid;
+                       nc.dn                                   = priv->domain_obj_dn?priv->domain_obj_dn:"";
+
+                       r.in.req.req1.naming_context            = &nc;
+                       r.in.req.req1.guid1                     = priv->dcinfo.ntds_guid;
+                       r.in.req.req1.string1                   = NULL;
+                       r.in.req.req1.options                   = 16;
+                       break;
+               }
+
+               status = dcerpc_drsuapi_DsReplicaSync(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       const char *errstr = nt_errstr(status);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                               errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                       }
+                       printf("dcerpc_drsuapi_DsReplicaSync failed - %s\n", errstr);
+                       ret = False;
+               } else if (!W_ERROR_IS_OK(r.out.result)) {
+                       printf("DsReplicaSync failed - %s\n", win_errstr(r.out.result));
+                       ret = False;
+               }
+       }
+
+       return ret;
+}
+
+static BOOL test_DsReplicaUpdateRefs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       BOOL ret = True;
+       int i;
+       struct drsuapi_DsReplicaUpdateRefs r;
+       struct drsuapi_DsReplicaObjectIdentifier nc;
+       struct GUID null_guid;
+       struct dom_sid null_sid;
+       struct {
+               int32_t level;
+       } array[] = {
+               {       
+                       1
+               }
+       };
+
+       ZERO_STRUCT(null_guid);
+       ZERO_STRUCT(null_sid);
+
+       r.in.bind_handle        = &priv->bind_handle;
+
+       for (i=0; i < ARRAY_SIZE(array); i++) {
+               printf("testing DsReplicaUpdateRefs level %d\n",
+                       array[i].level);
+
+               r.in.level = array[i].level;
+               switch(r.in.level) {
+               case 1:
+                       nc.guid                         = null_guid;
+                       nc.sid                          = null_sid;
+                       nc.dn                           = priv->domain_obj_dn?priv->domain_obj_dn:"";
+
+                       r.in.req.req1.naming_context    = &nc;
+                       r.in.req.req1.dest_dsa_dns_name = talloc_asprintf(mem_ctx, "__some_dest_dsa_guid_string._msdn.%s",
+                                                                               priv->domain_dns_name);
+                       r.in.req.req1.dest_dsa_guid     = null_guid;
+                       r.in.req.req1.options           = 0;
+                       break;
+               }
+
+               status = dcerpc_drsuapi_DsReplicaUpdateRefs(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       const char *errstr = nt_errstr(status);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                               errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                       }
+                       printf("dcerpc_drsuapi_DsReplicaUpdateRefs failed - %s\n", errstr);
+                       ret = False;
+               } else if (!W_ERROR_IS_OK(r.out.result)) {
+                       printf("DsReplicaUpdateRefs failed - %s\n", win_errstr(r.out.result));
+                       ret = False;
+               }
+       }
+
+       return ret;
+}
+
+static BOOL test_DsGetNCChanges(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       BOOL ret = True;
+       int i;
+       struct drsuapi_DsGetNCChanges r;
+       struct drsuapi_DsReplicaObjectIdentifier nc;
+       struct GUID null_guid;
+       struct dom_sid null_sid;
+       struct {
+               int32_t level;
+       } array[] = {
+               {       
+                       5
+               },
+               {       
+                       8
+               }
+       };
+
+       ZERO_STRUCT(null_guid);
+       ZERO_STRUCT(null_sid);
+
+       for (i=0; i < ARRAY_SIZE(array); i++) {
+               printf("testing DsGetNCChanges level %d\n",
+                       array[i].level);
+
+               r.in.bind_handle        = &priv->bind_handle;
+               r.in.level              = array[i].level;
+
+               switch (r.in.level) {
+               case 5:
+                       nc.guid = null_guid;
+                       nc.sid  = null_sid;
+                       nc.dn   = priv->domain_obj_dn?priv->domain_obj_dn:"";
+
+                       r.in.req.req5.destination_dsa_guid              = GUID_random();
+                       r.in.req.req5.source_dsa_guid                   = null_guid;
+                       r.in.req.req5.naming_context                    = &nc;
+                       r.in.req.req5.highwatermark.tmp_highest_usn     = 0;
+                       r.in.req.req5.highwatermark.reserved_usn        = 0;
+                       r.in.req.req5.highwatermark.highest_usn         = 0;
+                       r.in.req.req5.uptodateness_vector               = NULL;
+                       r.in.req.req5.replica_flags                     = 0;
+                       if (lp_parm_bool(-1, "drsuapi","compression", False)) {
+                               r.in.req.req5.replica_flags             |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES;
+                       }
+                       r.in.req.req5.unknown2                          = 0;
+                       r.in.req.req5.unknown3                          = 0;
+                       r.in.req.req5.unknown4                          = 0;
+                       r.in.req.req5.h1                                = 0;
+
+                       break;
+               case 8:
+                       nc.guid = null_guid;
+                       nc.sid  = null_sid;
+                       nc.dn   = priv->domain_obj_dn?priv->domain_obj_dn:"";
+
+                       r.in.req.req8.destination_dsa_guid              = GUID_random();
+                       r.in.req.req8.source_dsa_guid                   = null_guid;
+                       r.in.req.req8.naming_context                    = &nc;
+                       r.in.req.req8.highwatermark.tmp_highest_usn     = 0;
+                       r.in.req.req8.highwatermark.reserved_usn        = 0;
+                       r.in.req.req8.highwatermark.highest_usn         = 0;
+                       r.in.req.req8.uptodateness_vector               = NULL;
+                       r.in.req.req8.replica_flags                     = 0
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED
+                                                                       | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES
+                                                                       ;
+                       r.in.req.req8.unknown2                          = 402;
+                       r.in.req.req8.unknown3                          = 402116;
+                       r.in.req.req8.unknown4                          = 0;
+                       r.in.req.req8.h1                                = 0;
+                       r.in.req.req8.unique_ptr1                       = 0;
+                       r.in.req.req8.unique_ptr2                       = 0;
+                       r.in.req.req8.ctr12.count                       = 0;
+                       r.in.req.req8.ctr12.array                       = NULL;
+
+                       break;
+               }
+
+               status = dcerpc_drsuapi_DsGetNCChanges(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       const char *errstr = nt_errstr(status);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                               errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+                       }
+                       printf("dcerpc_drsuapi_DsGetNCChanges failed - %s\n", errstr);
+                       ret = False;
+               } else if (!W_ERROR_IS_OK(r.out.result)) {
+                       printf("DsGetNCChanges failed - %s\n", win_errstr(r.out.result));
+                       ret = False;
+               }
+       }
+
        return ret;
 }
 
 static BOOL test_DsUnbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                       struct policy_handle *bind_handle)
+                       struct DsPrivate *priv)
 {
        NTSTATUS status;
        struct drsuapi_DsUnbind r;
        BOOL ret = True;
 
-       r.in.bind_handle = bind_handle;
-       r.out.bind_handle = bind_handle;
+       r.in.bind_handle = &priv->bind_handle;
+       r.out.bind_handle = &priv->bind_handle;
+
+       printf("testing DsUnbind\n");
 
        status = dcerpc_drsuapi_DsUnbind(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -231,53 +1250,96 @@ static BOOL test_DsUnbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_DsUnbind failed - %s\n", errstr);
+               printf("dcerpc_drsuapi_DsUnbind failed - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("DsBind failed - %s\n", win_errstr(r.out.result));
                ret = False;
        }
 
        return ret;
 }
 
-BOOL torture_rpc_drsuapi(int dummy)
+BOOL torture_rpc_drsuapi(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
-       struct policy_handle bind_handle;
+       struct DsPrivate priv;
+
+       mem_ctx = talloc_init("torture_rpc_drsuapi");
 
-       status = torture_rpc_connection(&p, 
+       status = torture_rpc_connection(mem_ctx, 
+                                       &p, 
                                        DCERPC_DRSUAPI_NAME,
                                        DCERPC_DRSUAPI_UUID,
                                        DCERPC_DRSUAPI_VERSION);
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(mem_ctx);
                return False;
        }
 
        printf("Connected to DRAUAPI pipe\n");
 
+       ZERO_STRUCT(priv);
+
+       ret &= test_DsBind(p, mem_ctx, &priv);
+
+       ret &= test_DsGetDCInfo(p, mem_ctx, &priv);
+
+       ret &= test_DsCrackNames(p, mem_ctx, &priv);
+
+       ret &= test_DsWriteAccountSpn(p, mem_ctx, &priv);
+
+       ret &= test_DsReplicaGetInfo(p, mem_ctx, &priv);
+
+       ret &= test_DsReplicaSync(p, mem_ctx, &priv);
+
+       ret &= test_DsReplicaUpdateRefs(p, mem_ctx, &priv);
+
+       ret &= test_DsGetNCChanges(p, mem_ctx, &priv);
+
+       ret &= test_DsUnbind(p, mem_ctx, &priv);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+BOOL torture_rpc_drsuapi_cracknames(void)
+{
+        NTSTATUS status;
+        struct dcerpc_pipe *p;
+       TALLOC_CTX *mem_ctx;
+       BOOL ret = True;
+       struct DsPrivate priv;
+
        mem_ctx = talloc_init("torture_rpc_drsuapi");
 
-       if (!test_DsBind(p, mem_ctx, &bind_handle)) {
-               ret = False;
+       status = torture_rpc_connection(mem_ctx, 
+                                       &p, 
+                                       DCERPC_DRSUAPI_NAME,
+                                       DCERPC_DRSUAPI_UUID,
+                                       DCERPC_DRSUAPI_VERSION);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(mem_ctx);
+               return False;
        }
 
-       if (!test_DsCrackNames(p, mem_ctx, &bind_handle)) {
-               ret = False;
-       }
+       printf("Connected to DRAUAPI pipe\n");
 
-       if (!test_DsUnbind(p, mem_ctx, &bind_handle)) {
-               ret = False;
-       }
+       ZERO_STRUCT(priv);
 
-#if 0
-       if (!test_scan(p, mem_ctx)) {
-               ret = False;
-       }
-#endif
-       talloc_destroy(mem_ctx);
+       ret &= test_DsBind(p, mem_ctx, &priv);
+
+       ret &= test_DsGetDCInfo(p, mem_ctx, &priv);
+
+       ret &= test_DsCrackNames(p, mem_ctx, &priv);
+
+       ret &= test_DsUnbind(p, mem_ctx, &priv);
 
-        torture_rpc_close(p);
+       talloc_free(mem_ctx);
 
        return ret;
 }