diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-23 13:59:53 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-23 17:19:57 +0200 |
| commit | 532833de2428239ecf5407a391b083bc0c91aa25 (patch) | |
| tree | 74cbdaec368e8a35888bc23890bb2105493ae5dd | |
| parent | 7abda3fb9d10ec5c8b2f61508cd1362d324e3a8a (diff) | |
| download | samba-532833de2428239ecf5407a391b083bc0c91aa25.tar.gz samba-532833de2428239ecf5407a391b083bc0c91aa25.tar.bz2 samba-532833de2428239ecf5407a391b083bc0c91aa25.zip | |
libwbclient: rename MAXSUBAUTHS => WBC_MAXSUBAUTHS
metze
(cherry picked from commit 04d465c622c614bec29f24793ae897a73bcb51f4)
(This used to be commit e7dcbf56aef836e1b4be70b21064f65338221b5a)
| -rw-r--r-- | source3/nsswitch/libwbclient/wbc_pam.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/libwbclient/wbc_sid.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/libwbclient/wbclient.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/nsswitch/libwbclient/wbc_pam.c b/source3/nsswitch/libwbclient/wbc_pam.c index 0c1a32dded..6385094235 100644 --- a/source3/nsswitch/libwbclient/wbc_pam.c +++ b/source3/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/source3/nsswitch/libwbclient/wbc_sid.c b/source3/nsswitch/libwbclient/wbc_sid.c index de9b02822f..deec8e57c9 100644 --- a/source3/nsswitch/libwbclient/wbc_sid.c +++ b/source3/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/source3/nsswitch/libwbclient/wbclient.h b/source3/nsswitch/libwbclient/wbclient.h index da466b4041..df61578c32 100644 --- a/source3/nsswitch/libwbclient/wbclient.h +++ b/source3/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]; }; /** |