r24146: It is not an error for a Win2k3-only server not to support the NT4

replication call.

Andrew Bartlett

diff --git a/source/libcli/util/doserr.c b/source/libcli/util/doserr.c
index 3b1c2d264a49892c0e2262f95a0207229e3f26f4..d62a31c1fab30c0d2148c8d5ebd6695ff6c85c09 100644 (file)
--- a/source/libcli/util/doserr.c
+++ b/source/libcli/util/doserr.c
@@ -75,6 +75,7 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT },
        { "WERR_LOGON_FAILURE", WERR_LOGON_FAILURE },
        { "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR },
+       { "WERR_INVALID_DOMAIN_ROLE", WERR_INVALID_DOMAIN_ROLE },
        { "WERR_UNKNOWN_REVISION", WERR_UNKNOWN_REVISION },
        { "WERR_REVISION_MISMATCH", WERR_REVISION_MISMATCH },
        { "WERR_INVALID_OWNER", WERR_INVALID_OWNER },

diff --git a/source/libcli/util/doserr.h b/source/libcli/util/doserr.h
index 7dc938b2e7ec39bf52b1e35ddb00e9a315138b9b..0478eff9473d570762b384f4af1d145435d6d37e 100644 (file)
--- a/source/libcli/util/doserr.h
+++ b/source/libcli/util/doserr.h
@@ -201,6 +201,7 @@
 #define WERR_NO_SUCH_USER W_ERROR(1317)
 #define WERR_LOGON_FAILURE W_ERROR(1326)
 #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
+#define WERR_INVALID_DOMAIN_ROLE W_ERROR(1354)
 #define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
 #define WERR_NO_SYSTEM_RESOURCES W_ERROR(1450)
 #define WERR_SERVER_UNAVAILABLE W_ERROR(1722)

diff --git a/source/torture/rpc/dssync.c b/source/torture/rpc/dssync.c
index 8f22622846f050a3f8d7b88d369e88779a9d3eba..9546e5fd3db22a22076deb4de875d1064a1ef523 100644 (file)
--- a/source/torture/rpc/dssync.c
+++ b/source/torture/rpc/dssync.c
@@ -774,6 +774,9 @@ static BOOL test_FetchNT4Data(struct DsSyncTest *ctx)
                        }
                        printf("dcerpc_drsuapi_DsGetNT4ChangeLog failed - %s\n", errstr);
                        ret = False;
+               } else if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_DOMAIN_ROLE)) {
+                       printf("DsGetNT4ChangeLog not supported by target server\n");
+                       break;
                } else if (!W_ERROR_IS_OK(r.out.result)) {
                        printf("DsGetNT4ChangeLog failed - %s\n", win_errstr(r.out.result));
                        ret = False;