- Freeradius-Devel - lists.freeradius.org

[PATCH] tcp.c: elimiate warining "format '%ld', but argument has type 'ssize_t'
by Wang Tinggong 01 Feb '10

01 Feb '10

Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/lib/tcp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lib/tcp.c b/src/lib/tcp.c index 2f0946b..4a691c1 100644 --- a/src/lib/tcp.c +++ b/src/lib/tcp.c @@ -323,7 +323,7 @@ int fr_tcp_read_packet(RADIUS_PACKET *packet, int flags) DEBUG("rad_recv: Packet from %s code=%d", buffer, packet->code); } - DEBUG(", id=%d, length=%ld\n", packet->id, packet->data_len); + DEBUG(", id=%d, length=%d\n", packet->id, packet->data_len); } return 1; /* done reading the packet */ -- 1.6.0.6

4 5

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

01 Feb '10

hi, this is a series of trivial patch for eliminating build warnings. this series doesn't solve warning "discards qualifiers from XXX type" , caused by assignments between CONST and non-CONST, such operation is deprecated by C99. if this make noises, plz forgive me. thanks! Tinggong Signed-off-by: Wang Tinggong <wangtinggong(a)gmail.com> --- src/include/libradius.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/include/libradius.h b/src/include/libradius.h index 9553544..9ea525a 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -225,7 +225,7 @@ typedef struct radius_packet { /* * Printing functions. */ -int fr_utf8_char(const uint8_t *str); +unsigned int fr_utf8_char(const uint8_t *str); void fr_print_string(const char *in, size_t inlen, char *out, size_t outlen); int vp_prints_value(char *out, size_t outlen, -- 1.6.0.6 =================================================== 北京福富软件技术股份有限公司福州分公司增值业务部产品开发部王廷功 TEL:0591-88389025 FAX:0591-83519928 ADDR:福州市铜盘路软件大道89号A区12#楼 ZIP:350003 Email: wangtg(a)ffcs.cn ===================================================

2 1

[trivial PATCH 21/22] [rlm_sql_log.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_sql_log/rlm_sql_log.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_sql_log/rlm_sql_log.c b/src/modules/rlm_sql_log/rlm_sql_log.c index a4ab2b8..85b5985 100644 --- a/src/modules/rlm_sql_log/rlm_sql_log.c +++ b/src/modules/rlm_sql_log/rlm_sql_log.c @@ -200,13 +200,13 @@ static size_t sql_escape_func(char *out, size_t outlen, const char *in) static size_t sql_utf8_escape_func(char *out, size_t outlen, const char *in) { int len = 0; - int utf8 = 0; + unsigned int utf8 = 0; while (in[0]) { /* * Skip over UTF8 characters */ - utf8 = fr_utf8_char((uint8_t *)in); + utf8 = fr_utf8_char((const uint8_t *)in); if (utf8) { if (outlen <= utf8) { break; -- 1.6.0.6

2 1

[trivial PATCH 22/22] [rlm_sqlcounter.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_sqlcounter/rlm_sqlcounter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index 63c3b43..a48f1c5 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -678,7 +678,7 @@ static int sqlcounter_authorize(void *instance, REQUEST *request) * Check if check item > counter */ if (check_vp->vp_integer > counter) { - unsigned int res = check_vp->lvalue - counter; + int res = check_vp->lvalue - counter; DEBUG2("rlm_sqlcounter: Check item is greater than query result"); /* @@ -705,7 +705,7 @@ static int sqlcounter_authorize(void *instance, REQUEST *request) } if ((reply_item = pairfind(request->reply->vps, data->reply_attr)) != NULL) { - if (reply_item->vp_integer > res) + if (res<0 || reply_item->vp_integer > (unsigned int)res) reply_item->vp_integer = res; } else { reply_item = radius_paircreate(request, -- 1.6.0.6

1 0

[trivial PATCH 20/22] [rlm_policy.h] 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.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/rlm_policy/rlm_policy.h b/src/modules/rlm_policy/rlm_policy.h index e5e8e18..7e0963f 100644 --- a/src/modules/rlm_policy/rlm_policy.h +++ b/src/modules/rlm_policy/rlm_policy.h @@ -266,7 +266,7 @@ extern int rlm_policy_insert(rbtree_t *head, policy_named_t *policy); extern policy_named_t *rlm_policy_find(rbtree_t *head, const char *name); extern int rlm_policy_parse(rbtree_t *policies, const char *filename); -extern void rlm_policy_free_item(policy_item_t *item); +extern void rlm_policy_free_item(void *it); extern void rlm_policy_print(const policy_item_t *item); extern int rlm_policy_evaluate(rlm_policy_t *inst, REQUEST *request, const char *name); -- 1.6.0.6

1 0

[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