February 2010 - Freeradius-Devel - lists.freeradius.org

[trivial PATCH 19/22] [rlm_policy.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_policy/rlm_policy.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_policy/rlm_policy.c b/src/modules/rlm_policy/rlm_policy.c index 3c848d6..0a13b5e 100644 --- a/src/modules/rlm_policy/rlm_policy.c +++ b/src/modules/rlm_policy/rlm_policy.c @@ -205,8 +205,10 @@ static int policy_send_coa(void *instance, REQUEST *request) /* * The "free" functions are here, for no particular reason. */ -void rlm_policy_free_item(policy_item_t *item) +void rlm_policy_free_item(void *it) { + policy_item_t *item = (policy_item_t*)it; + while (item) { policy_item_t *next = item->next; @@ -302,7 +304,7 @@ void rlm_policy_free_item(policy_item_t *item) } break; } /* switch over type */ - item->next = NULL; /* for debugging & sanity checks */ + ((policy_item_t*)item)->next = NULL; /* for debugging & sanity checks */ item->type = POLICY_TYPE_BAD; free(item); -- 1.6.0.6

1 0

[trivial PATCH 18/22] [parse.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_policy/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/rlm_policy/parse.c b/src/modules/rlm_policy/parse.c index 8bc9c64..a57f546 100644 --- a/src/modules/rlm_policy/parse.c +++ b/src/modules/rlm_policy/parse.c @@ -1532,7 +1532,7 @@ static int parse_named_policy(policy_lex_file_t *lexer) } if ((lexer->debug & POLICY_DEBUG_PRINT_POLICY) != 0) { - rlm_policy_print(this); + rlm_policy_print((const policy_item_t *)this); } return 1; -- 1.6.0.6

1 0

[trivial PATCH 17/22] [rlm_pap.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_pap/rlm_pap.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index 540aa4d..8cdef63 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -483,7 +483,7 @@ static int pap_authenticate(void *instance, REQUEST *request) FR_MD5_CTX md5_context; fr_SHA1_CTX sha1_context; uint8_t digest[40]; - char buff[MAX_STRING_LEN]; + unsigned char buff[MAX_STRING_LEN]; char buff2[MAX_STRING_LEN + 50]; int scheme = PAP_ENC_INVALID; @@ -711,13 +711,15 @@ static int pap_authenticate(void *instance, REQUEST *request) snprintf(buff2, sizeof(buff2), "%%{mschap:NT-Hash %s}", request->password->vp_strvalue); - if (!radius_xlat(digest, sizeof(digest),buff2,request,NULL)){ + if (!radius_xlat((char*)digest, sizeof(digest), buff2, + request, NULL)){ RDEBUG("mschap xlat failed"); snprintf(module_fmsg,sizeof(module_fmsg),"rlm_pap: mschap xlat failed"); goto make_msg; } - if ((fr_hex2bin(digest, digest, 16) != vp->length) || - (memcmp(digest, vp->vp_octets, vp->length) != 0)) { + if ((fr_hex2bin((const char*)digest, digest, 16) + != vp->length) + || (memcmp(digest, vp->vp_octets, vp->length) != 0)) { snprintf(module_fmsg,sizeof(module_fmsg),"rlm_pap: NT password check failed"); goto make_msg; } @@ -736,12 +738,13 @@ static int pap_authenticate(void *instance, REQUEST *request) } snprintf(buff2, sizeof(buff2), "%%{mschap:LM-Hash %s}", request->password->vp_strvalue); - if (!radius_xlat(digest,sizeof(digest),buff2,request,NULL)){ + if (!radius_xlat((char*)digest, sizeof(digest), buff2, + request, NULL)){ RDEBUG("mschap xlat failed"); snprintf(module_fmsg,sizeof(module_fmsg),"rlm_pap: mschap xlat failed"); goto make_msg; } - if ((fr_hex2bin(digest, digest, 16) != vp->length) || + if ((fr_hex2bin((char*)digest, digest, 16) != vp->length) || (memcmp(digest, vp->vp_octets, vp->length) != 0)) { snprintf(module_fmsg,sizeof(module_fmsg),"rlm_pap: LM password check failed"); make_msg: -- 1.6.0.6

1 0

[trivial PATCH 16/22] [otp_util.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_otp/otp_util.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/rlm_otp/otp_util.c b/src/modules/rlm_otp/otp_util.c index 4087381..0259cea 100644 --- a/src/modules/rlm_otp/otp_util.c +++ b/src/modules/rlm_otp/otp_util.c @@ -34,7 +34,7 @@ RCSID("$Id$") * Return some random bytes. */ void -otp_get_random(char *rnd_data, size_t len) +otp_get_random(unsigned char *rnd_data, size_t len) { size_t bytes_read = 0; @@ -70,10 +70,10 @@ otp_async_challenge(char challenge[OTP_MAX_CHALLENGE_LEN + 1], int len) /* ascii to hex; returns HEXlen on success or -1 on error */ int -otp_a2x(const char *s, unsigned char x[]) +otp_a2x(const unsigned char *s, unsigned char x[]) { unsigned i; - size_t l = strlen(s); + size_t l = strlen((const char*)s); /* * We could just use sscanf, but we do this a lot, and have very -- 1.6.0.6

1 0

[trivial PATCH 15/22] [otp_rlm.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_otp/otp_rlm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/rlm_otp/otp_rlm.c b/src/modules/rlm_otp/otp_rlm.c index 2de71d2..11c692f 100644 --- a/src/modules/rlm_otp/otp_rlm.c +++ b/src/modules/rlm_otp/otp_rlm.c @@ -242,8 +242,9 @@ otp_authorize(void *instance, REQUEST *request) int32_t now = htonl(time(NULL)); /* low-order 32 bits on LP64 */ char state[OTP_MAX_RADSTATE_LEN]; - if (otp_gen_state(state, NULL, challenge, inst->challenge_len, 0, - now, hmac_key) != 0) { + if (otp_gen_state(state, NULL, (unsigned char*)challenge, + inst->challenge_len, 0, + now, hmac_key) != 0) { (void) radlog(L_ERR, "rlm_otp: %s: failed to generate radstate",__func__); return RLM_MODULE_FAIL; } @@ -318,7 +319,7 @@ otp_authenticate(void *instance, REQUEST *request) unsigned char raw_state[OTP_MAX_RADSTATE_LEN]; unsigned char rad_state[OTP_MAX_RADSTATE_LEN]; int32_t then; /* state timestamp */ - int e_length; /* expected State length */ + unsigned int e_length; /* expected State length */ /* set expected State length */ e_length = inst->challenge_len * 2 + 8 + 8 + 32; /* see otp_gen_state() */ -- 1.6.0.6

1 0

[trivial PATCH 14/22] [otp_radstate.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_otp/otp_radstate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/rlm_otp/otp_radstate.c b/src/modules/rlm_otp/otp_radstate.c index b896413..04adff2 100644 --- a/src/modules/rlm_otp/otp_radstate.c +++ b/src/modules/rlm_otp/otp_radstate.c @@ -142,7 +142,7 @@ otp_gen_state(char rad_state[OTP_MAX_RADSTATE_LEN], if (rad_state) { (void) sprintf(rad_state, "0x"); p = rad_state + 2; - otp_x2a(state, strlen(state), p); + otp_x2a((unsigned char*)state, strlen(state), p); } if (raw_state) -- 1.6.0.6

1 0

[trivial PATCH 13/22] [otp_pw_valid.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_otp/otp_pw_valid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_otp/otp_pw_valid.c b/src/modules/rlm_otp/otp_pw_valid.c index d05516f..e5ff630 100644 --- a/src/modules/rlm_otp/otp_pw_valid.c +++ b/src/modules/rlm_otp/otp_pw_valid.c @@ -71,7 +71,7 @@ static pthread_mutex_t otp_fd_head_mutex = PTHREAD_MUTEX_INITIALIZER; * NB: The returned passcode will contain the PIN! DO NOT LOG! */ int -otp_pw_valid(REQUEST *request, int pwe, const char *challenge, +otp_pw_valid(REQUEST *request, int pwe, const unsigned char *challenge, const otp_option_t *opt, char passcode[OTP_MAX_PASSCODE_LEN + 1]) { otp_request_t otp_request; @@ -88,7 +88,7 @@ otp_pw_valid(REQUEST *request, int pwe, const char *challenge, otp_request.version = 2; (void) strcpy(otp_request.username, username); - (void) strcpy(otp_request.challenge, challenge); + (void) strcpy(otp_request.challenge, (const char*)challenge); otp_request.pwe.pwe = pwe; /* otp_pwe_present() (done by caller) guarantees that both of these exist */ -- 1.6.0.6

1 0

[trivial PATCH 10/22] [rlm_mschap.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/modules/rlm_mschap/rlm_mschap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index faee861..7b7573a 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -72,6 +72,9 @@ extern int od_mschap_auth(REQUEST *request, VALUE_PAIR *challenge, VALUE_PAIR * #define ACB_PWNOEXP 0x0200 /* 1 = User password does not expire */ #define ACB_AUTOLOCK 0x0400 /* 1 = Account auto locked */ +extern void mschap_add_reply(REQUEST *request, VALUE_PAIR** vp, + unsigned char ident, const char* name, const char* value, int len); + static int pdb_decode_acct_ctrl(const char *p) { int acct_ctrl = 0; -- 1.6.0.6

1 0

[trivial PATCH 09/22] [xlat.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/main/xlat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/xlat.c b/src/main/xlat.c index 6f498a9..3220d4b 100644 --- a/src/main/xlat.c +++ b/src/main/xlat.c @@ -775,7 +775,7 @@ static int decode_attribute(const char **from, char **to, int freespace, expand2 = TRUE; } else if ((p[0] == '"') || p[0] == '\'') { - getstring(&p, l, strlen(l)); + getstring((const char**)&p, l, strlen(l)); } else { l = p; -- 1.6.0.6

1 0

[trivial PATCH 08/22] [modcall.c] eliminate build warnings
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/main/modcall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/modcall.c b/src/main/modcall.c index bcd0e24..ff0640b 100644 --- a/src/main/modcall.c +++ b/src/main/modcall.c @@ -28,6 +28,7 @@ RCSID("$Id$") #include <freeradius-devel/modcall.h> #include <freeradius-devel/rad_assert.h> +extern int radius_get_vp(REQUEST *request, const char *name, VALUE_PAIR **vp_p); /* mutually-recursive static functions need a prototype up front */ static modcallable *do_compile_modgroup(modcallable *, -- 1.6.0.6

1 0