libwbclient: rename MAXSUBAUTHS => WBC_MAXSUBAUTHS

metze
(cherry picked from commit 04d465c622c614bec29f24793ae897a73bcb51f4)

diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index a0e91faaf36eca2b01a6136d57b687ca7d944f48..3e0b6a5a0a2d8cb1d2c80dee6e895d5737389c03 100644 (file)
--- 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 de9b02822f508b8d4c6655f8235b5f9dcc4c0301..deec8e57c97206c30e642b294c7007dbbc48fb70 100644 (file)
--- 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 f236c43e11649730ce8565aa0b8601734e43a060..e4a0aeba47f6a3c4dd38876ac59c11f8d6f4980b 100644 (file)
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/nsswitch/libwbclient/wbclient.h
@@ -68,8 +68,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
 
 /**
@@ -81,7 +81,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];
 };
 
 /**