patch #422856 from Sebastian Rittau to move to pam_unix.so (& cleanups)

diff --git a/config/Makefile.am b/config/Makefile.am
index af8818446bc5316168b0ed59560bcf423bd2cffc..c3a3905e0f61d0a4020713753dc08f2eee5cf704 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -2,44 +2,37 @@
 
 SUFFIXES = .tmpl .
 
-.tmpl:
-       sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
-           -e s@:NLS_PATH:@${CONFIG_DIR}/nls@ \
-           -e s@:ETCDIR:@${CONFIG_DIR}@ \
-           <$^ >$@
-
-CLEANFILES = afpd.conf netatalk
+GENFILES = afpd.conf
+TMPLFILES = $(foreach file,$(GENFILES),$(file).tmpl)
+CONFFILES = AppleVolumes.default AppleVolumes.system \
+       atalkd.conf netatalk.conf netatalk.pamd papd.conf
+PAMFILES = netatalk.pamd
 
-configdir = $(CONFIG_DIR)
+EXTRA_DIST = $(CONFFILES) $(TMPLFILES) $(PAMFILES)
 
-config_DATA = AppleVolumes.default AppleVolumes.system afpd.conf \
-       atalkd.conf netatalk.conf netatalk.pamd papd.conf
+CLEANFILES += $(GENFILES)
 
-EXTRA_DIST = $(config_DATA)
+sysconf_DATA = $(CONFFILES) $(GENFILES)
 
 #
-# pluggable authentication modules check for shadow password support
+# rule to parse template files
 #
 
-if USE_SHADOWPW
-PAMD = netatalk.pamd.shadow
-else
-PAMD = netatalk.pamd
-endif
+.tmpl:
+       sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
+           -e s@:NLS_PATH:@${sysconfdir}/nls@ \
+           -e s@:ETCDIR:@${sysconfdir}@ \
+           <$^ >$@
 
 #
-# pluggable authentication modules support?
+# pluggable authentication modules support
 #
 
 if USE_PAM
 
-pamdir    = /etc/pam.d
-pam_DATA = netatalk
-
-netatalk:
-       cp -f $(PAMD) netatalk
+pamdir   = $(sysconfdir)/pam.d
 
 install-data-local: netatalk
-       $(INSTALL) netatalk $(DESTDIR)$(pamdir)/
+       $(INSTALL_DATA) netatalk $(DESTDIR)$(pamdir)/
 
 endif 

diff --git a/config/netatalk.pamd b/config/netatalk.pamd
index 45776270254e9bc7ae13c98ba9aa3fa9283c6105..69fa4499ed55ccc20015883fe4b832d263bc51bd 100644 (file)
--- a/config/netatalk.pamd
+++ b/config/netatalk.pamd
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       required    /lib/security/pam_pwdb.so shadow
-account    required    /lib/security/pam_pwdb.so 
+auth       required    /lib/security/pam_unix.so
+account    required    /lib/security/pam_unix.so 
 #password   required   /lib/security/pam_cracklib.so
-#password   required   /lib/security/pam_pwdb.so shadow use_authtok
-session    required    /lib/security/pam_pwdb.so 
+#password   required   /lib/security/pam_unix.so use_authtok
+session    required    /lib/security/pam_unix.so