Solaris10 support with PAM.

acconfig.h

@@ -14,6 +14,9 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
 /* Define if you have the <libgen.h> header file.  */
 #undef HAVE_LIBGEN_H
 

auth_pam.c

@@ -125,6 +125,8 @@ auth_pam(struct passwd **ppw, const char *pass)
 		break;
 	}
 
+/* XXX this does not work on solaris10 */
+#ifndef solaris
 	if (rval == 0) {
 		e = pam_acct_mgmt(pamh, 0);
 		if (e == PAM_NEW_AUTHTOK_REQD) {
@@ -138,6 +140,7 @@ auth_pam(struct passwd **ppw, const char *pass)
 			rval = 1;
 		}
 	}
+#endif /* solaris */
 
 	MESSAGE_1 ("auth_pam returns %d\n", rval);
 	return rval;

conf.h

@@ -52,6 +52,10 @@
 #include <syslog.h>
 #endif /* HAVE_SYSLOG_H */
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
+
 #include <signal.h>
 #include <stdio.h>
 #include <time.h>

configure.in

@@ -3,7 +3,7 @@ dnl
 dnl $Id: //depot/security/calife/main/configure.in#18 $
 dnl
 
-AC_INIT(calife.c)
+AC_INIT(calife.c, [3.0], [[email protected]])
 AC_CONFIG_HEADER(config.h)
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -34,8 +34,11 @@ case "$host" in
     CFLAGS="$CFLAGS -DAIX"
     AC_CHECK_LIB(s, getuserattr)
     ;;
-  *-sun-solaris*)
+  *-sun-solaris2*)
     os_solaris=yes
+    WITH_PAM=yes
+    with_pam=yes
+    AC_DEFINE(WITH_PAM)
     ;;
   *-apple-darwin*)
     os_darwin=yes
@@ -156,6 +159,22 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h libgen.h shadow.h stdarg.h stdlib.h)
 AC_CHECK_HEADERS(string.h syslog.h unistd.h)
 AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/time.h)
+
+AC_CHECK_HEADERS([utime.h], [], [],
+[[#ifdef HAVE_UTIME_H
+# include <utime.h>
+#endif
+]])
+
+AC_CHECK_HEADERS([sys/resource.h], [], [],
+[[#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+]])
+
 AC_MSG_CHECKING(whether unistd.h needs _XOPEN_SOURCE for crypt(3))
 AC_CACHE_VAL(su_cv_unistd_needs_xopen_source,
 [AC_EGREP_CPP(yes, [#define crypt yes

pam/solaris

@@ -0,0 +1,4 @@
+# Insert these lines in your /etc/pam.conf
+calife  auth requisite          pam_authtok_get.so.1
+calife  auth required           pam_unix_cred.so.1
+calife  auth required           pam_unix_auth.so.1