svn commit: samba r24146 - in branches/SAMBA_4_0/source: libcli/util torture/rpc

[abartlet at samba.org]

Author: abartlet
Date: 2007-08-03 08:25:15 +0000 (Fri, 03 Aug 2007)
New Revision: 24146

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24146

Log:
It is not an error for a Win2k3-only server not to support the NT4
replication call.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/util/doserr.c
   branches/SAMBA_4_0/source/libcli/util/doserr.h
   branches/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/doserr.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/doserr.c	2007-08-03 07:00:19 UTC (rev 24145)
+++ branches/SAMBA_4_0/source/libcli/util/doserr.c	2007-08-03 08:25:15 UTC (rev 24146)
@@ -75,6 +75,7 @@
 	{ "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 },

Modified: branches/SAMBA_4_0/source/libcli/util/doserr.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/doserr.h	2007-08-03 07:00:19 UTC (rev 24145)
+++ branches/SAMBA_4_0/source/libcli/util/doserr.h	2007-08-03 08:25:15 UTC (rev 24146)
@@ -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)

Modified: branches/SAMBA_4_0/source/torture/rpc/dssync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/dssync.c	2007-08-03 07:00:19 UTC (rev 24145)
+++ branches/SAMBA_4_0/source/torture/rpc/dssync.c	2007-08-03 08:25:15 UTC (rev 24146)
@@ -774,6 +774,9 @@
 			}
 			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;