From 202affa511125cf54d86d92a9ee1b6ecd49ad5af Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sun, 19 Oct 2008 13:18:20 +0200
Subject: [PATCH] rpc: Fix the merged build breaking on StrnCaseCmp.

---
 librpc/ndr/ndr_drsuapi.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index 38474c25406..4d1ae8b163d 100644
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -25,6 +25,8 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "../lib/util/asn1.h"
 #include "librpc/ndr/ndr_compression.h"
+/* We don't need multibyte if we're just comparing to 'ff' */
+#undef strncasecmp
 
 void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const char *name,
 					       const struct drsuapi_DsReplicaObjectListItem *r)
@@ -91,11 +93,7 @@ enum ndr_err_code ndr_push_drsuapi_DsReplicaOID(struct ndr_push *ndr, int ndr_fl
 		if (r->oid) {
 			DATA_BLOB blob;
 
-#if (_SAMBA_BUILD_ == 3)
-			if (StrnCaseCmp("ff", r->oid, 2) == 0) {
-#else
 			if (strncasecmp("ff", r->oid, 2) == 0) {
-#endif
 				blob = strhex_to_data_blob(ndr, r->oid);
 				if (!blob.data) {
 					return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT,
@@ -167,11 +165,7 @@ size_t ndr_size_drsuapi_DsReplicaOID_oid(const char *oid, int flags)
 
 	if (!oid) return 0;
 
-#if (_SAMBA_BUILD_ == 3)
-	if (StrnCaseCmp("ff", oid, 2) == 0) {
-#else
 	if (strncasecmp("ff", oid, 2) == 0) {
-#endif
 		_blob = strhex_to_data_blob(NULL, oid);
 		if (_blob.data) {
 			ret = _blob.length;
-- 
2.34.1