[X2Go-Commits] [x2gobroker] 01/01: Provide a special PAM configuration file for SUSE systems (identical to the PAM configuration file for Debian).

git-admin at x2go.org git-admin at x2go.org
Wed Oct 29 16:56:52 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 5da22fc97d6ec579b323d4aeb7c56ddb9d883ef9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 29 16:56:43 2014 +0100

    Provide a special PAM configuration file for SUSE systems (identical to the PAM configuration file for Debian).
---
 Makefile            |    3 ++-
 debian/changelog    |    2 ++
 pam/x2gobroker.SUSE |    2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fa41cf3..9abdcd4 100755
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,8 @@ install:
 	${INSTALL_FILE} etc/broker/x2gobroker-loggers.conf "${DESTDIR}${ETCDIR}/broker/"
 	if [ -e /etc/debian_version ]; then ${INSTALL_FILE} pam/x2gobroker.Debian "${DESTDIR}/etc/pam.d/x2gobroker"; fi
 	if [ -e /etc/redhat-release ]; then ${INSTALL_FILE} pam/x2gobroker.RHEL "${DESTDIR}/etc/pam.d/x2gobroker"; fi
-	
+	if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null; then ${INSTALL_FILE} pam/x2gobroker.SUSE "${DESTDIR}/etc/pam.d/x2gobroker"; fi
+
 	# x2gobroker-agent
 	mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \
 	        "${DESTDIR}${MANDIR}/man8"
diff --git a/debian/changelog b/debian/changelog
index 71b9b0e..dd07727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -177,6 +177,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       before trying to create the socket file itself.
     - Don't load defaults.conf twice. Only load it when initializing the
       loggers.
+    - Provide a special PAM configuration file for SUSE systems
+      (identical to the PAM configuration file for Debian).
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/pam/x2gobroker.SUSE b/pam/x2gobroker.SUSE
new file mode 100644
index 0000000..b561496
--- /dev/null
+++ b/pam/x2gobroker.SUSE
@@ -0,0 +1,2 @@
+ at include common-auth
+ at include common-password

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list