Fix compilation warnings.

diff --git a/src/main/files.c b/src/main/files.c
index e65af23..4d766e7 100644 (file)
--- a/src/main/files.c
+++ b/src/main/files.c
@@ -410,17 +410,17 @@ int read_realms_file(const char *file)
                 *      Double-check lengths to be sure they're sane
                 */
                if (strlen(hostnm) >= sizeof(c->server)) {
-                       radlog(L_ERR, "%s[%d]: server name of length %d is greater than the allowed maximum of %d.",
+                       radlog(L_ERR, "%s[%d]: server name of length %u is greater than the allowed maximum of %u.",
                               file, lineno,
-                              (int) strlen(hostnm),
-                              (int) sizeof(c->server) - 1);
+                              strlen(hostnm),
+                              sizeof(c->server) - 1);
                        return -1;
                }
                if (strlen(realm) > sizeof(c->realm)) {
-                       radlog(L_ERR, "%s[%d]: realm of length %d is greater than the allowed maximum of %d.",
+                       radlog(L_ERR, "%s[%d]: realm of length %u is greater than the allowed maximum of %u.",
                               file, lineno,
-                              (int) strlen(realm),
-                              (int) sizeof(c->realm) - 1);
+                              strlen(realm),
+                              sizeof(c->realm) - 1);
                        return -1;
                }
 

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index b7b0839..80e6f72 100644 (file)
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -624,10 +624,10 @@ static int generate_realms(const char *filename)
                         * Double check length, just to be sure!
                         */
                        if (strlen(authhost) >= sizeof(c->server)) {
-                               radlog(L_ERR, "%s[%d]: Server name of length %d is greater than allowed: %d",
+                               radlog(L_ERR, "%s[%d]: Server name of length %u is greater than allowed: %u",
                                       filename, cf_section_lineno(cs),
-                                      (int) strlen(authhost),
-                                      (int) sizeof(c->server) - 1);
+                                      strlen(authhost),
+                                      sizeof(c->server) - 1);
                                return -1;
                        }
                }
@@ -665,19 +665,19 @@ static int generate_realms(const char *filename)
                        }
 
                        if (strlen(accthost) >= sizeof(c->acct_server)) {
-                               radlog(L_ERR, "%s[%d]: Server name of length %d is greater than allowed: %d",
+                               radlog(L_ERR, "%s[%d]: Server name of length %u is greater than allowed: %u",
                                       filename, cf_section_lineno(cs),
-                                      (int) strlen(accthost),
-                                      (int) sizeof(c->acct_server) - 1);
+                                      strlen(accthost),
+                                      sizeof(c->acct_server) - 1);
                                return -1;
                        }
                }
 
                if (strlen(name2) >= sizeof(c->realm)) {
-                       radlog(L_ERR, "%s[%d]: Realm name of length %d is greater than allowed %d",
+                       radlog(L_ERR, "%s[%d]: Realm name of length %u is greater than allowed %u",
                               filename, cf_section_lineno(cs),
-                              (int) strlen(name2),
-                              (int) sizeof(c->server) - 1);
+                              strlen(name2),
+                              sizeof(c->server) - 1);
                        return -1;
                }
 
@@ -701,7 +701,7 @@ static int generate_realms(const char *filename)
                        }
 
                        if (strlen(s) >= sizeof(c->secret)) {
-                               radlog(L_ERR, "%s[%d]: Secret of length %d is greater than the allowed maximum of %d.",
+                               radlog(L_ERR, "%s[%d]: Secret of length %u is greater than the allowed maximum of %u.",
                                       filename, cf_section_lineno(cs),
                                       strlen(s), sizeof(c->secret) - 1);
                                return -1;

diff --git a/src/modules/rlm_eap/libeap/fips186prf.c b/src/modules/rlm_eap/libeap/fips186prf.c
index a5a7e58..f0f01e4 100644 (file)
--- a/src/modules/rlm_eap/libeap/fips186prf.c
+++ b/src/modules/rlm_eap/libeap/fips186prf.c
@@ -104,7 +104,7 @@ void fips186_2prf(uint8_t mk[20], uint8_t finalkey[160])
        int j;
        onesixty xval, xkey, w_0, w_1, sum, one;
        uint8_t *f;
-       char zeros[64];
+       uint8_t zeros[64];
 
        /*
         * let XKEY := MK,
@@ -266,7 +266,10 @@ main(int argc, char *argv[])
 
 /*
  * $Log$
- * Revision 1.3  2004-02-26 19:04:30  aland
+ * Revision 1.4  2005-09-21 03:02:40  nbk
+ *     Fix compilation warnings.
+ *
+ * Revision 1.3  2004/02/26 19:04:30  aland
  *     perl -i -npe "s/[ \t]+$//g" `find src -name "*.[ch]" -print`
  *
  *     Whitespace changes only, from a fresh checkout.

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 1b3487b..6e7a6c0 100644 (file)
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -73,7 +73,8 @@ static expr_map_t map[] =
 static int get_number(REQUEST *request, const char **string, int *answer)
 {
        int             i, found;
-       uint32_t        result, x;
+       uint32_t        result;
+       int             x;
        const char      *p;
        expr_token_t    this;
 

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index ce0bb92..47ccd0f 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -154,7 +154,7 @@ static int pdb_decode_acct_ctrl(const char *p)
  *     ntpwdhash converts Unicode password to 16-byte NT hash
  *     with MD4
  */
-static void ntpwdhash (char *szHash, const char *szPassword)
+static void ntpwdhash (unsigned char *szHash, const char *szPassword)
 {
        char szUnicodePass[513];
        int nPasswordLen;
@@ -185,7 +185,7 @@ static void challenge_hash( const uint8_t *peer_challenge,
                            const char *user_name, uint8_t *challenge )
 {
        SHA1_CTX Context;
-       char hash[20];
+       uint8_t hash[20];
 
        SHA1Init(&Context);
        SHA1Update(&Context, peer_challenge, 16);
@@ -201,19 +201,19 @@ static void challenge_hash( const uint8_t *peer_challenge,
  *     returns 42-octet response string
  */
 static void auth_response(const char *username,
-                         const char *nt_hash_hash,
-                         char *ntresponse,
+                         const uint8_t *nt_hash_hash,
+                         uint8_t *ntresponse,
                          char *peer_challenge, char *auth_challenge,
                          char *response)
 {
        SHA1_CTX Context;
-       const char magic1[39] =
+       const uint8_t magic1[39] =
        {0x4D, 0x61, 0x67, 0x69, 0x63, 0x20, 0x73, 0x65, 0x72, 0x76,
         0x65, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x6C, 0x69, 0x65,
         0x6E, 0x74, 0x20, 0x73, 0x69, 0x67, 0x6E, 0x69, 0x6E, 0x67,
         0x20, 0x63, 0x6F, 0x6E, 0x73, 0x74, 0x61, 0x6E, 0x74};
 
-       const char magic2[41] =
+       const uint8_t magic2[41] =
        {0x50, 0x61, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x6D, 0x61, 0x6B,
         0x65, 0x20, 0x69, 0x74, 0x20, 0x64, 0x6F, 0x20, 0x6D, 0x6F,
         0x72, 0x65, 0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x6F, 0x6E,
@@ -221,7 +221,7 @@ static void auth_response(const char *username,
         0x6E};
 
         char challenge[8];
-        char digest[20];
+       uint8_t digest[20];
 
        SHA1Init(&Context);
        SHA1Update(&Context, nt_hash_hash, 16);
@@ -969,7 +969,8 @@ static int mschap_authorize(void * instance, REQUEST *request)
 static int mschap_authenticate(void * instance, REQUEST *request)
 {
 #define inst ((rlm_mschap_t *)instance)
-       VALUE_PAIR *challenge = NULL, *response = NULL;
+       VALUE_PAIR *challenge = NULL;
+       VALUE_PAIR *response = NULL;
        VALUE_PAIR *password = NULL;
        VALUE_PAIR *lm_password, *nt_password, *smb_ctrl;
        VALUE_PAIR *username;

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index 9c5db3d..7a561d5 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -441,7 +441,7 @@ static int pap_authenticate(void *instance, REQUEST *request)
        char module_fmsg[MAX_STRING_LEN];
        MD5_CTX md5_context;
        SHA1_CTX sha1_context;
-       char digest[40];
+       uint8_t digest[40];
        char buff[MAX_STRING_LEN];
        char buff2[MAX_STRING_LEN + 50];
        int scheme = PAP_ENC_INVALID;