From 59a3d8221c3761cade00cb10ed4abd4ee3036a89 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Sun, 31 Jan 2021 04:31:27 +0800
Subject: [PATCH] dtlogin: rename PAM config file.

---
 cde/programs/dtlogin/config/Imakefile               |  4 ++--
 cde/programs/dtlogin/config/Xsetup.src              | 13 +++++++++----
 .../{dtlogin.pam.conf.src => pam.d.dtlogin.src}     |  0
 3 files changed, 11 insertions(+), 6 deletions(-)
 rename cde/programs/dtlogin/config/{dtlogin.pam.conf.src => pam.d.dtlogin.src} (100%)

diff --git a/cde/programs/dtlogin/config/Imakefile b/cde/programs/dtlogin/config/Imakefile
index 3f6b46ac0..91d21274b 100644
--- a/cde/programs/dtlogin/config/Imakefile
+++ b/cde/programs/dtlogin/config/Imakefile
@@ -56,7 +56,7 @@ CPP_TARGETS = \
 	Xstartup		current.session \
 	display.current.session	display.home.session \
 	dtlslocale		dtprofile \
-	home.session	dtlogin.pam.conf \
+	home.session	pam.d.dtlogin \
 	$(EXTRA_CPP_TARGETS)
 
 AllTarget($(CPP_TARGETS))
@@ -92,5 +92,5 @@ CppSourceFile(dtprofile,dtprofile.src,$(LOCAL_CPP_DEFINES),)
 CppSourceFile(home.session,home.session.src,$(LOCAL_CPP_DEFINES),)
 
 #if defined(HasPamLibrary) && HasPamLibrary
-CppSourceFile(dtlogin.pam.conf,dtlogin.pam.conf.src,$(LOCAL_CPP_DEFINES),)
+CppSourceFile(pam.d.dtlogin,pam.d.dtlogin.src,$(LOCAL_CPP_DEFINES),)
 #endif
diff --git a/cde/programs/dtlogin/config/Xsetup.src b/cde/programs/dtlogin/config/Xsetup.src
index b4a06f870..75741ea8e 100644
--- a/cde/programs/dtlogin/config/Xsetup.src
+++ b/cde/programs/dtlogin/config/Xsetup.src
@@ -88,10 +88,15 @@ fi
 #define PAM_D /etc/pam.d
 #endif
 
-  if [ ! -f PAM_D/dtlogin ]; then
-    if [ -f CDE_INSTALLATION_TOP/config/dtlogin.pam.conf ]; then
-      /bin/cp CDE_INSTALLATION_TOP/config/dtlogin.pam.conf PAM_D/dtlogin
-      /bin/chmod 644 PAM_D/dtlogin
+for i in CDE_INSTALLATION_TOP/config/pam.d.*
+do
+  conf=PAM_D/${i##*.}
+
+  if [ ! -f $conf ]; then
+    if [ -f $i ]; then
+      /bin/cp $i $conf
+      /bin/chmod 644 $conf
     fi
   fi
+done
 #endif
diff --git a/cde/programs/dtlogin/config/dtlogin.pam.conf.src b/cde/programs/dtlogin/config/pam.d.dtlogin.src
similarity index 100%
rename from cde/programs/dtlogin/config/dtlogin.pam.conf.src
rename to cde/programs/dtlogin/config/pam.d.dtlogin.src