Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------
2008-05-14  Tomas Mraz <t8m@centrum.cz>

        * libpam/pam_modutil_getgrgid.c: Replace hardcoded constant with
        define PWD_LENGTH_SHIFT.
        * libpam/pam_modutil_getgrnam.c: Likewise.
        * libpam/pam_modutil_getpwnam.c: Likewise.
        * libpam/pam_modutil_getpwuid.c: Likewise.
        * libpam/pam_modutil_getspnam.c: Likewise.
        * libpam/pam_modutil_private.h: Adjust values for PWD_ constants.

diff --git a/ChangeLog b/ChangeLog
index 23ef2d9b0a74d3d29a8feb3aa10a8317e6996db8..0546b9c76b215a25f5efacc9666710605080f311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-14  Tomas Mraz <t8m@centrum.cz>
+
+       * libpam/pam_modutil_getgrgid.c: Replace hardcoded constant with
+       define PWD_LENGTH_SHIFT.
+       * libpam/pam_modutil_getgrnam.c: Likewise.
+       * libpam/pam_modutil_getpwnam.c: Likewise.
+       * libpam/pam_modutil_getpwuid.c: Likewise.
+       * libpam/pam_modutil_getspnam.c: Likewise.
+       * libpam/pam_modutil_private.h: Adjust values for PWD_ constants.
+
 2008-05-02  Tomas Mraz <t8m@centrum.cz>
 
        * modules/pam_selinux/pam_selinux.c(query_response): Add handling

diff --git a/libpam/pam_modutil_getgrgid.c b/libpam/pam_modutil_getgrgid.c
index 03d03daa188b234c513ab6a6db50f72a97e2b45d..600946a15f7975b404a402fab7c46ade6df87eb2 100644 (file)
--- a/libpam/pam_modutil_getgrgid.c
+++ b/libpam/pam_modutil_getgrgid.c
@@ -115,7 +115,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid)
                break;
        }
        
-       length <<= 2;
+       length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 

diff --git a/libpam/pam_modutil_getgrnam.c b/libpam/pam_modutil_getgrnam.c
index c224db7b30d97b6c2dc14b42e165d85c5f9f2edd..adf7daa23068eef61da3c10ce71482983a46417a 100644 (file)
--- a/libpam/pam_modutil_getgrnam.c
+++ b/libpam/pam_modutil_getgrnam.c
@@ -104,7 +104,7 @@ pam_modutil_getgrnam(pam_handle_t *pamh, const char *group)
                 break;
         }
        
-       length <<= 2;
+       length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 

diff --git a/libpam/pam_modutil_getpwnam.c b/libpam/pam_modutil_getpwnam.c
index a9dcd6c34f6ddb6c9c15fffd842fc82060e1cd66..f4e4d80e04340ef99be8a9b438b47ec0253f8d1d 100644 (file)
--- a/libpam/pam_modutil_getpwnam.c
+++ b/libpam/pam_modutil_getpwnam.c
@@ -104,7 +104,7 @@ pam_modutil_getpwnam(pam_handle_t *pamh, const char *user)
                 break;
         }
        
-       length <<= 2;
+       length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 

diff --git a/libpam/pam_modutil_getpwuid.c b/libpam/pam_modutil_getpwuid.c
index bf364a3ec18db0851a7b055723c1e5987e4ad296..33a6cf490ce38edf5d27ee1be8f68e002ca932cb 100644 (file)
--- a/libpam/pam_modutil_getpwuid.c
+++ b/libpam/pam_modutil_getpwuid.c
@@ -115,7 +115,7 @@ pam_modutil_getpwuid(pam_handle_t *pamh, uid_t uid)
                 break;
         }
        
-       length <<= 2;
+       length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 

diff --git a/libpam/pam_modutil_getspnam.c b/libpam/pam_modutil_getspnam.c
index 6eaf5d4c2ccc6763dc59ec2ee0f5bd373ae109b8..7cc64881bcfbb9aa055aa2b72ca2bca66e853a1f 100644 (file)
--- a/libpam/pam_modutil_getspnam.c
+++ b/libpam/pam_modutil_getspnam.c
@@ -104,7 +104,7 @@ pam_modutil_getspnam(pam_handle_t *pamh, const char *user)
                 break;
         }
        
-       length <<= 2;
+       length <<= PWD_LENGTH_SHIFT;
 
     } while (length < PWD_ABSURD_PWD_LENGTH);
 

diff --git a/libpam/pam_modutil_private.h b/libpam/pam_modutil_private.h
index f242fdfe5f28d7befa0125acff005e8692953d64..98a30f6886012bb9db3e0c9bbeb1d4ff8179e346 100644 (file)
--- a/libpam/pam_modutil_private.h
+++ b/libpam/pam_modutil_private.h
@@ -13,8 +13,9 @@
 #include <security/pam_modules.h>
 #include <security/pam_modutil.h>
 
-#define PWD_INITIAL_LENGTH     0x100
-#define PWD_ABSURD_PWD_LENGTH  0x8000
+#define PWD_INITIAL_LENGTH     0x400
+#define PWD_ABSURD_PWD_LENGTH  0x40001
+#define PWD_LENGTH_SHIFT 4 /* 2^4 == 16 */
 
 extern void
 pam_modutil_cleanup(pam_handle_t *pamh, void *data,