Fixes so krb5_seteuid compiles on Ultrix

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8058 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 599317d8fcb2c65b80a39721c0960669787ae258..0bc2b335a32e5ef0dde77b4cf839afadda665049 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 20 02:51:06 1996  Sam Hartman  <hartmans@mit.edu>
+
+       * k5-int.h: Ultrix CC wants krb5_seteuid to take uid_t so that the
+       type can be promoted from a short.
+
 Sat May 18 16:53:06 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * k5-int.h: Add krb5_seteuid

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 55f1cae124a53f0576fb83479f658585ac5817a6..825a49b6ea6522e1779855f1fd32dbd684407124 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1431,7 +1431,7 @@ krb5_error_code krb5_ser_unpack_bytes KRB5_PROTOTYPE((krb5_octet *,
  */
 #define KRB5_VERIFY_MAGIC(structure,magic_number) \
     if ((structure)->magic != (magic_number)) return (magic_number);
-    
-int krb5_seteuid  KRB5_PROTOTYPE((uid_t));
+
+int krb5_seteuid  KRB5_PROTOTYPE((int));
 
 #endif /* _KRB5_INT_H */

diff --git a/src/lib/krb5util/ChangeLog b/src/lib/krb5util/ChangeLog
index 92dca5ba9ef35eabd94708db86055d061e586a57..ce17d9639ef031a9efcc9843c52d5e7b3abc397e 100644 (file)
--- a/src/lib/krb5util/ChangeLog
+++ b/src/lib/krb5util/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 20 02:37:44 1996  Sam Hartman  <hartmans@mit.edu>
+
+       * seteuid.c: Include k5-int.h
+
 Sun May 19 23:28:22 1996  Sam Hartman  <hartmans@mit.edu>
 
        * seteuid.c (krb5_seteuid): set saved uid to current effective

diff --git a/src/lib/krb5util/configure.in b/src/lib/krb5util/configure.in
index 7bcfa4872f7e0408fe25db7fee39e9c18b00b631..638bf2735536157d0aeb8bde1d95495b7c7a43ba 100644 (file)
--- a/src/lib/krb5util/configure.in
+++ b/src/lib/krb5util/configure.in
@@ -4,7 +4,7 @@ AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
-AC_CHECK_HEADERS(unistd.h stdlib.h)
+AC_CHECK_HEADERS(unistd.h stdlib.h sys/types.h)
 AC_CHECK_FUNCS(seteuid setresuid setreuid)
 LinkFileDir(../libkrb5util.a, libkrb5util.a, ./krb5util)
 AppendRule([all-unix:: ../libkrb5util.a])

diff --git a/src/lib/krb5util/seteuid.c b/src/lib/krb5util/seteuid.c
index a84db79ad87c7567853e29c6a17dea8fcfc5d8f3..017e0b9ad2c40127ae3c7fa3f54a17739f036c00 100644 (file)
--- a/src/lib/krb5util/seteuid.c
+++ b/src/lib/krb5util/seteuid.c
@@ -17,7 +17,11 @@
  * express or implied warranty.
  * 
  */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
+#include <k5-int.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -27,11 +31,13 @@
 #include <stdlib.h>
 #endif
 
+
 #include <errno.h>
 
-int krb5_seteuid( euid)
-  uid_t euid;
+int krb5_seteuid( euid_in)
+  int euid_in;
 {
+  uid_t euid = (uid_t) euid_in;
 #if defined(_POSIX_SAVED_IDS) && defined(HAVE_SETEUID)
   return  (seteuid(euid)) ;
 #else