- (tim) [configure.ac defines.h openbsd-compat/port-uw.c

   openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
   OK djm@ dtucker@

diff --git a/ChangeLog b/ChangeLog
index 331d813c4bc29df7cf4ead880d0c9e1f9ef58965..2799540eff7b8ae565837b61109c5db5313644de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20090107
+ - (tim) [configure.ac defines.h openbsd-compat/port-uw.c
+   openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
+   OK djm@ dtucker@
+
 20081209
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2008/12/09 02:38:18

diff --git a/configure.ac b/configure.ac
index febeb147f48afd92875edc80f2008fe08619502c..9b90c24577e955892340b116e4cdbfbc77365ad9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -741,6 +741,11 @@ mips-sony-bsd|mips-sony-newsos4)
                AC_DEFINE(BROKEN_LIBIAF, 1,
                        [ia_uinfo routines not supported by OS yet])
                AC_DEFINE(BROKEN_UPDWTMPX)
+               AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot"
+                       AC_CHECK_FUNCS(getluid setluid,,,-lprot)
+                       AC_DEFINE(HAVE_SECUREWARE)
+                       AC_DEFINE(DISABLE_SHADOW)
+                       ],,)
                ;;
        *)      AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
                ;;

diff --git a/defines.h b/defines.h
index febc590602756998241ddf03dcd80211d5c1d087..71fba4ada446824bd693823dcec7a5f82e2e1364 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -698,7 +698,7 @@ struct winsize {
 # define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 
-#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID)
+#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(HAVE_SECUREWARE)
 # define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)

diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c
index ebc229a6a06ef615b447231a271a9a21f8d3de39..be9905a6af9b1b3fb3be504565dbfaec650db2b3 100644 (file)
--- a/openbsd-compat/port-uw.c
+++ b/openbsd-compat/port-uw.c
@@ -25,7 +25,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_LIBIAF
+#if defined(HAVE_LIBIAF)  &&  !defined(HAVE_SECUREWARE)
 #include <sys/types.h>
 #ifdef HAVE_CRYPT_H
 # include <crypt.h>
@@ -145,5 +145,5 @@ get_iaf_password(struct passwd *pw)
                fatal("ia_openinfo: Unable to open the shadow passwd file");
 }
 #endif /* USE_LIBIAF */
-#endif /* HAVE_LIBIAF */
+#endif /* HAVE_LIBIAF and not HAVE_SECUREWARE */
 

diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index d8636bb398e107da73820616002f014d07d5445c..6291e2884c5c266478ff1a5733b8bedb1260eeab 100644 (file)
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <pwd.h>
 
-# ifdef HAVE_CRYPT_H
+# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE)
 #  include <crypt.h>
 # endif