pam: configure.in, libpam/pam_auth.c, libpam/pam_prelude.c, libpam...
baggins
baggins at pld-linux.org
Mon Jul 11 18:54:14 CEST 2005
Author: baggins Date: Mon Jul 11 16:54:14 2005 GMT
Module: pam Tag: HEAD
---- Log message:
- autoconf for SELinux
- attempt at autoconf for prelude (not finished yet)
---- Files affected:
pam:
configure.in (1.56 -> 1.57)
pam/libpam:
pam_auth.c (1.6 -> 1.7) , pam_prelude.c (1.2 -> 1.3) , pam_prelude.h (1.1 -> 1.2)
---- Diffs:
================================================================
Index: pam/configure.in
diff -u pam/configure.in:1.56 pam/configure.in:1.57
--- pam/configure.in:1.56 Mon Jul 11 18:00:30 2005
+++ pam/configure.in Mon Jul 11 18:54:09 2005
@@ -47,6 +47,7 @@
AH_TEMPLATE(USE_LCKPWDF,Define this if you want pam to use lckpwdf().)
AH_TEMPLATE(WANT_PAM_PWEXPORT_MODULE,Define this if you want pam_pwexport module. Warning - insecure.)
AH_TEMPLATE(WITH_SELINUX,Define this if you want SELinux support.)
+AH_TEMPLATE(WITH_PRELUDE,Define this if you want Prelude IDS support.)
AH_TEMPLATE(linux,Define this if you are building pam on Linux.)
AH_TEMPLATE(solaris,Define this if you are building pam on Solaris.)
AH_TEMPLATE(sunos,Define this if you are building pam on SunOS.)
@@ -170,6 +171,44 @@
AC_MSG_RESULT([yes])
)
+AC_CHECK_LIB(selinux, getfilecon, selinux_present=true, selinux_present=false)
+AC_MSG_CHECKING([whether to use SELinux])
+AC_ARG_ENABLE(selinux, [ --enable-selinux Enable SELinux support [default=yes]],
+ if test \( "$enableval" = "yes" -o "$selinux" = "yes" \) -a "$selinux_present" = "true" ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
+ fi
+ AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
+ AC_DEFINE(WITH_SELINUX),
+ AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
+ AC_DEFINE(WITH_SELINUX)
+ if test "$selinux_present" = "false"; then
+ AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
+ else
+ AC_MSG_RESULT([yes])
+ fi
+)
+
+AC_CHECK_LIB(prelude, getfilecon, prelude_present=true, prelude_present=false)
+AC_MSG_CHECKING([whether to use Prelude IDS])
+AC_ARG_ENABLE(prelude, [ --enable-prelude Enable Prelude IDS support in libpam [default=yes]],
+ if test \( "$enableval" = "yes" -o "$prelude" = "yes" \) -a "$prelude_present" = "true" ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_WARN(Prelude support will not be enabled.)
+ fi
+ AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
+ AC_DEFINE(WITH_PRELUDE),
+ AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
+ AC_DEFINE(WITH_PRELUDE),
+ if test "$prelude_present" = "false"; then
+ AC_MSG_WARN(Prelude support will not be enabled.)
+ else
+ AC_MSG_RESULT([yes])
+ fi
+)
+
dnl Checks for programs.
AC_PROG_CC
@@ -291,8 +330,8 @@
AC_MSG_WARN(pam_cap module will not be built!))
AC_CHECK_LIB(opie, opieverify, opielib_present=true,
AC_MSG_WARN(pam_opie modules will not be built!))
-AC_CHECK_LIB(selinux, getfilecon, selinux_present=true,
- AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!))
+AC_CHECK_LIB(prelude, getfilecon, prelude_present=true,
+ AC_MSG_WARN(Prelude IDS support will not be enabled!))
AC_MSG_CHECKING(for hosts_access in -lwrap)
oldLIBS=$LIBS
LIBS="$LIBS -lwrap"
@@ -315,10 +354,6 @@
AM_CONDITIONAL(CAPLIB_PRESENT, test x$caplib_present = xtrue)
AM_CONDITIONAL(WRAPLIB_PRESENT, test x$wraplib_present = xtrue)
AM_CONDITIONAL(OPIELIB_PRESENT, test x$opielib_present = xtrue)
-AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
-if test x"$selinux_present" = x"true"; then
- AC_DEFINE(WITH_SELINUX)
-fi
AC_MSG_CHECKING([where cracklib_dict is located])
AC_ARG_ENABLE(cracklib_dict, [ --with-cracklib-dict Directory where cracklib_dict is located],
================================================================
Index: pam/libpam/pam_auth.c
diff -u pam/libpam/pam_auth.c:1.6 pam/libpam/pam_auth.c:1.7
--- pam/libpam/pam_auth.c:1.6 Thu Apr 7 14:54:23 2005
+++ pam/libpam/pam_auth.c Mon Jul 11 18:54:09 2005
@@ -42,7 +42,7 @@
D(("will resume when ready"));
}
-#ifdef PRELUDE
+#ifdef WITH_PRELUDE
prelude_send_alert(pamh, retval);
#endif
================================================================
Index: pam/libpam/pam_prelude.c
diff -u pam/libpam/pam_prelude.c:1.2 pam/libpam/pam_prelude.c:1.3
--- pam/libpam/pam_prelude.c:1.2 Mon Jul 11 16:58:43 2005
+++ pam/libpam/pam_prelude.c Mon Jul 11 18:54:09 2005
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <syslog.h>
-#ifdef PRELUDE
+#ifdef WITH_PRELUDE
#include <libprelude/prelude.h>
#include <libprelude/prelude-log.h>
@@ -456,4 +456,4 @@
}
-#endif /* PRELUDE */
+#endif /* WITH_PRELUDE */
================================================================
Index: pam/libpam/pam_prelude.h
diff -u pam/libpam/pam_prelude.h:1.1 pam/libpam/pam_prelude.h:1.2
--- pam/libpam/pam_prelude.h:1.1 Thu Apr 7 16:16:41 2005
+++ pam/libpam/pam_prelude.h Mon Jul 11 18:54:09 2005
@@ -8,7 +8,7 @@
#ifndef _SECURITY_PAM_PRELUDE_H
#define _SECURITY_PAM_PRELUDE_H
-#include <security/_pam_types.h>
+#include "security/_pam_types.h"
void prelude_send_alert(pam_handle_t *pamh, int authval);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pam/configure.in?r1=1.56&r2=1.57&f=u
http://cvs.pld-linux.org/pam/libpam/pam_auth.c?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/pam/libpam/pam_prelude.c?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/pam/libpam/pam_prelude.h?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list