diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-23 13:59:53 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-05-23 15:27:29 +0200 |
| commit | bc24cee4f9dba9a2df53326c83eeab44bd5057f6 (patch) | |
| tree | 8f01e762878f07cf0ad004486a4dd28bc818fb00 | |
| parent | 56f630063ce533dfb6f3c51046b7e27b7305c7be (diff) | |
| download | samba-bc24cee4f9dba9a2df53326c83eeab44bd5057f6.tar.gz | |
libwbclient: rename MAXSUBAUTHS => WBC_MAXSUBAUTHS
metze
(cherry picked from commit 04d465c622c614bec29f24793ae897a73bcb51f4)
| -rw-r--r-- | source/nsswitch/libwbclient/wbc_pam.c | 2 | ||||
| -rw-r--r-- | source/nsswitch/libwbclient/wbc_sid.c | 2 | ||||
| -rw-r--r-- | 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 a0e91faaf36..3e0b6a5a0a2 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 f236c43e116..e4a0aeba47f 100644 --- 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]; }; /** |