Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2007-08-29  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_rhosts/pam_rhosts_auth.c: buflen needs to be size_t.
        (__icheckhost): Cast to int32_t to fix limited range error.

        * modules/pam_cracklib/pam_cracklib.c: Mark cracklib_dictpath
        as const.

diff --git a/ChangeLog b/ChangeLog
index b3a00aed70e974daac51bb3f474ef96db6c850ea..91a17c13f070683dc8c3084722efaa8dfe09108c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-29  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_rhosts/pam_rhosts_auth.c: buflen needs to be size_t.
+       (__icheckhost): Cast to int32_t to fix limited range error.
+
+       * modules/pam_cracklib/pam_cracklib.c: Mark cracklib_dictpath
+       as const.
+
 2007-08-29  Steve Langasek <vorlon@debian.org>
 
        * modules/pam_rhosts/pam_rhosts_auth.c: getline returns -1 at

diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c
index 663c80dd0ae223b738ee650d208078683fa784a9..14fa24e0c6886eb4bd8d899032df151173b57d8e 100644 (file)
--- a/modules/pam_cracklib/pam_cracklib.c
+++ b/modules/pam_cracklib/pam_cracklib.c
@@ -99,7 +99,7 @@ struct cracklib_options {
         int min_class;
        int use_authtok;
        char prompt_type[BUFSIZ];
-        char *cracklib_dictpath;
+        const char *cracklib_dictpath;
 };
 
 #define CO_RETRY_TIMES  1

diff --git a/modules/pam_rhosts/pam_rhosts_auth.c b/modules/pam_rhosts/pam_rhosts_auth.c
index a798c1f07af27107c7f2b35d594e0b553bd2f54a..48fdeced40073302ff12043f8dbd3ac704cfe1f6 100644 (file)
--- a/modules/pam_rhosts/pam_rhosts_auth.c
+++ b/modules/pam_rhosts/pam_rhosts_auth.c
@@ -267,7 +267,7 @@ __icheckhost (pam_handle_t *pamh, struct _options *opts, u_int32_t raddr
 
 
     /* Try for raw ip address first. */
-    if (isdigit(*lhost) && (long)(laddr = inet_addr(lhost)) != -1)
+    if (isdigit(*lhost) && (int32_t)(laddr = inet_addr(lhost) != -1))
        return (negate*(! (raddr ^ laddr)));
 
     /* Better be a hostname. */
@@ -350,7 +350,7 @@ __ivaliduser (pam_handle_t *pamh, struct _options *opts,
     int retval = 1;
 #ifdef HAVE_GETLINE
     char *buf=NULL;
-    int buflen=0;
+    size_t buflen=0;
 
     while (getline(&buf,&buflen,hostf) > 0) {
 #else