Relevant BUGIDs: 127700

Purpose of commit: bugfix

Commit summary:
---------------
ia64 support - it behaves like an alpha wrt md5, but then unsigned int
is 32 bits everywhere(*) these days, so just remove the #ifdef nonsense.

diff --git a/CHANGELOG b/CHANGELOG
index e3ff71b4dc6cfcc748a29764b59e04a14f90636b..dec92f0e7b1525d5ebac67ddbf8653e29c153bb2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ Where you should replace XXXXX with a bug-id.
 0.74: please submit patches for this section with actual code/doc
       patches!
 
+* md5.h ia64 fixes for pam_unix and pam_pwdb (Bug 127700 - agmorgan)
 * removed requirement for c++ from the configure{.in,} files (Bug
   128298 - agmorgan)
 * removed subdirectories from man page redirections (124396 - baggins)

diff --git a/modules/pam_pwdb/md5.h b/modules/pam_pwdb/md5.h
index 279ce46fe21fe4a75b7ba04f7ad3b600c06e5e6e..75c4dbac85e1be7ac00f466b05c1a60e1aa2d2e9 100644 (file)
--- a/modules/pam_pwdb/md5.h
+++ b/modules/pam_pwdb/md5.h
@@ -1,11 +1,7 @@
 #ifndef MD5_H
 #define MD5_H
 
-#ifdef __alpha
 typedef unsigned int uint32;
-#else
-typedef unsigned long uint32;
-#endif
 
 struct MD5Context {
     uint32 buf[4];

diff --git a/modules/pam_unix/md5.h b/modules/pam_unix/md5.h
index 469e5bd1f15849032b3dc121cecfffd636c8007f..103f168a91c6bb15fa812db85d9baa1d7c8412be 100644 (file)
--- a/modules/pam_unix/md5.h
+++ b/modules/pam_unix/md5.h
@@ -2,11 +2,7 @@
 #ifndef MD5_H
 #define MD5_H
 
-#ifdef __alpha
 typedef unsigned int uint32;
-#else
-typedef unsigned long uint32;
-#endif
 
 struct MD5Context {
        uint32 buf[4];