Relevant BUGIDs: debian #326407

Purpose of commit: bugfix

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

2008-11-25  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_time/pam_time.c (is_same): Fix check
        of correct string length (debian bug #326407).

diff --git a/ChangeLog b/ChangeLog
index ae725e51fb3476e86155a0cb09779aec0747e12b..05bb175e5cdb89097cdf969ac9cb4d2da3fb8b46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2008-11-25  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_time/pam_time.c (is_same): Fix check
+       of correct string length (debian bug #326407).
+
 2008-10-17  Tomas Mraz <t8m@centrum.cz> 
 
-        * modules/pam_keyinit/pam_keyinit.c (kill_keyrings): Save the old
-        euid to suid to be able to restore it.
+       * modules/pam_keyinit/pam_keyinit.c (kill_keyrings): Save the old
+       euid to suid to be able to restore it.
 
 2008-09-25  Tomas Mraz <t8m@centrum.cz>
 

diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index 8e3b2486e80da7aeac95c06d569cfdde759fc656..7e418808036e88cd1f4df8d6abf74ef4643ee6be 100644 (file)
--- a/modules/pam_time/pam_time.c
+++ b/modules/pam_time/pam_time.c
@@ -358,8 +358,8 @@ is_same(pam_handle_t *pamh UNUSED, const void *A, const char *b,
 
      /* Ok, we know that b is a substring from A and does not contain
         wildcards, but now the length of both strings must be the same,
-        too. */
-     if (strlen (a) != strlen(b))
+        too. In this case it means, a[i] has to be the end of the string. */
+     if (a[i] != '\0')
           return FALSE;
 
      return ( !len );