From e7dcbf56aef836e1b4be70b21064f65338221b5a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 23 May 2008 13:59:53 +0200
Subject: [PATCH] libwbclient: rename MAXSUBAUTHS => WBC_MAXSUBAUTHS

metze
(cherry picked from commit 04d465c622c614bec29f24793ae897a73bcb51f4)
---
 source/nsswitch/libwbclient/wbc_pam.c  | 2 +-
 source/nsswitch/libwbclient/wbc_sid.c  | 2 +-
 source/nsswitch/libwbclient/wbclient.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index 0c1a32ddedd..63850942358 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -117,7 +117,7 @@ static wbcErr wbc_create_auth_info(TALLOC_CTX *mem_ctx,
 
 #define _SID_COMPOSE(s, d, r, a) { \
 	(s).sid = d; \
-	if ((s).sid.num_auths < MAXSUBAUTHS) { \
+	if ((s).sid.num_auths < WBC_MAXSUBAUTHS) { \
 		(s).sid.sub_auths[(s).sid.num_auths++] = r; \
 	} else { \
 		wbc_status = WBC_ERR_INVALID_SID; \
diff --git a/source/nsswitch/libwbclient/wbc_sid.c b/source/nsswitch/libwbclient/wbc_sid.c
index de9b02822f5..deec8e57c97 100644
--- a/source/nsswitch/libwbclient/wbc_sid.c
+++ b/source/nsswitch/libwbclient/wbc_sid.c
@@ -139,7 +139,7 @@ wbcErr wbcStringToSid(const char *str,
 
 	p = q +1;
 	sid->num_auths = 0;
-	while (sid->num_auths < MAXSUBAUTHS) {
+	while (sid->num_auths < WBC_MAXSUBAUTHS) {
 		if ((x=(uint32_t)strtoul(p, &q, 10)) == 0)
 			break;
 		sid->sub_auths[sid->num_auths++] = x;
diff --git a/source/nsswitch/libwbclient/wbclient.h b/source/nsswitch/libwbclient/wbclient.h
index da466b40412..df61578c320 100644
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/nsswitch/libwbclient/wbclient.h
@@ -70,8 +70,8 @@ struct wbcInterfaceDetails {
  * Data types used by the Winbind Client API
  */
 
-#ifndef MAXSUBAUTHS
-#define MAXSUBAUTHS 15 /* max sub authorities in a SID */
+#ifndef WBC_MAXSUBAUTHS
+#define WBC_MAXSUBAUTHS 15 /* max sub authorities in a SID */
 #endif
 
 /**
@@ -83,7 +83,7 @@ struct wbcDomainSid {
 	uint8_t   sid_rev_num;
 	uint8_t   num_auths;
 	uint8_t   id_auth[6];
-	uint32_t  sub_auths[MAXSUBAUTHS];
+	uint32_t  sub_auths[WBC_MAXSUBAUTHS];
 };
 
 /**
-- 
2.11.4.GIT