diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libpam/pam_modutil_getgrgid.c | 2 | ||||
| -rw-r--r-- | libpam/pam_modutil_getgrnam.c | 2 | ||||
| -rw-r--r-- | libpam/pam_modutil_getpwnam.c | 2 | ||||
| -rw-r--r-- | libpam/pam_modutil_getpwuid.c | 2 | ||||
| -rw-r--r-- | libpam/pam_modutil_getspnam.c | 2 | ||||
| -rw-r--r-- | libpam/pam_modutil_private.h | 5 |
7 files changed, 18 insertions, 7 deletions
@@ -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 03d03daa..600946a1 100644 --- 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 c224db7b..adf7daa2 100644 --- 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 a9dcd6c3..f4e4d80e 100644 --- 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 bf364a3e..33a6cf49 100644 --- 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 6eaf5d4c..7cc64881 100644 --- 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 f242fdfe..98a30f68 100644 --- 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, |