On Thu, 2009-01-08 at 13:36 +0100, Jan-Frode Myklebust wrote:
> On 2009-01-08, Yan Gao <[email protected]> wrote:
> >> Or is this different from distribution to distribution.. ?
> > I think so. When configuring the source codes, it'll try to use
> > "common-{auth, account}" if available. Otherwise, it'll use pam_unix.so.
> > As far as I know, the "common-*" ones work for SuSE and Debian. Which
> > distribution are you using?
> 
> RHEL5.
Could you pls test the attached patch in your environment?
It's for heartbeat-2.1.4

-- 
Regards,
Yan Gao
China R&D Software Engineer
[email protected]

Novell, Inc.
Making IT Work As One?6?4
diff -r 74d736e8f667 configure.in
--- a/configure.in	Wed Nov 12 15:26:06 2008 +0100
+++ b/configure.in	Fri Jan 09 16:03:31 2009 +0800
@@ -2560,11 +2560,18 @@
 AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
 
 dnl ************************************************************************
-dnl * Check for (debian style?) $sysconfdir/pam.d/common-{account,auth}
-AC_CHECK_FILE($sysconfdir/pam.d/common-account)
-AC_CHECK_FILE($sysconfdir/pam.d/common-auth)
-AM_CONDITIONAL(USE_PAM_COMMON, test -f $sysconfdir/pam.d/common-account -a \
-				    -f /etc/pam.d/common-auth)
+dnl * Check pam style
+
+if test -f $sysconfdir/pam.d/common-account -a \
+		-f $sysconfdir/pam.d/common-auth; then
+	PAM_FILE_SUFFIX=".common"
+elif test -f $sysconfdir/pam.d/system-auth; then
+	PAM_FILE_SUFFIX=".system"
+else
+	PAM_FILE_SUFFIX=""
+fi
+
+AC_SUBST(PAM_FILE_SUFFIX)
 
 dnl GNUTLS library: Attempt to determine by 'libgnutls-config' program.
 dnl If no 'libgnutls-config', try traditional autoconf means.
diff -r 74d736e8f667 mgmt/daemon/Makefile.am
--- a/mgmt/daemon/Makefile.am	Wed Nov 12 15:26:06 2008 +0100
+++ b/mgmt/daemon/Makefile.am	Fri Jan 09 16:03:31 2009 +0800
@@ -28,16 +28,12 @@
 COMMONLIBS	=  $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(GLIBLIB)
 noinst_HEADERS	=  mgmt_internal.h
-EXTRA_DIST	=  mgmtd.pam mgmtd.pam.common
+EXTRA_DIST	=  mgmtd.pam mgmtd.pam.common mgmtd.pam.system
 		   
 LRM_DIR		= lrm
 
 pamdir 		= $(sysconfdir)/pam.d
-if USE_PAM_COMMON
-pam_DATA	= mgmtd.pam.common
-else
-pam_DATA	= mgmtd.pam
-endif
+pam_DATA	= mgmtd....@pam_file_suffix@
 
 install-data-hook:
 		mv $(DESTDIR)$(pamdir)/$(pam_DATA) $(DESTDIR)$(pamdir)/hbmgmtd
diff -r 74d736e8f667 mgmt/daemon/mgmtd.pam.system
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mgmt/daemon/mgmtd.pam.system	Fri Jan 09 16:03:31 2009 +0800
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth include system-auth
+account include system-auth
_______________________________________________
Linux-HA mailing list
[email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha
See also: http://linux-ha.org/ReportingProblems

Reply via email to