Re: [systemd-devel] [PATCH] build: allow specifying a custom pam session name
On Fri, 26.07.13 00:28, Marc-Antoine Perennou (marc-anto...@perennou.com) wrote: for distribution now wanting to use systemd-shared In systemd git this is now renamed to systemd-user. This really should get a fixed PAM name of its own and shouldn't be configurable. Signed-off-by: Marc-Antoine Perennou marc-anto...@perennou.com --- Makefile.am| 1 + configure.ac | 10 ++ units/u...@.service.in | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d013dfd..8030c5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4072,6 +4072,7 @@ substitutions = \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|SUSHELL=$(SUSHELL)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \ + '|PAM_NAME=$(PAM_NAME)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ '|MKDIR_P=$(MKDIR_P)|' \ diff --git a/configure.ac b/configure.ac index 759073a..c1d2dac 100644 --- a/configure.ac +++ b/configure.ac @@ -404,6 +404,15 @@ AC_SUBST(PAM_LIBS) AM_CONDITIONAL([HAVE_PAM], [test x$have_pam != xno]) # -- +AC_ARG_WITH([pam-name], +AS_HELP_STRING([--with-pam-name=NAME], +[Specify the PAM session name to set up a session as]), +[PAM_NAME=$withval], +[PAM_NAME=systemd-shared]) + +AC_SUBST(PAM_NAME) + +# -- AC_ARG_ENABLE([acl], AS_HELP_STRING([--disable-acl],[Disable optional ACL support]), [case ${enableval} in @@ -1027,6 +1036,7 @@ AC_MSG_RESULT([ Installation Python: ${PYTHON_BINARY} firmware path: ${FIRMWARE_PATH} PAM modules dir: ${with_pamlibdir} +PAM session name:${with_pam_name} D-Bus policy dir:${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir:${with_dbussystemservicedir} diff --git a/units/u...@.service.in b/units/u...@.service.in index 8f9a3b3..ce53d31 100644 --- a/units/u...@.service.in +++ b/units/u...@.service.in @@ -11,7 +11,7 @@ After=systemd-user-sessions.service [Service] User=%I -PAMName=systemd-shared +PAMName=@PAM_NAME@ Type=notify ExecStart=-@rootlibexecdir@/systemd --user Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket Lennart -- Lennart Poettering - Red Hat, Inc. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH] build: allow specifying a custom pam session name
for distribution now wanting to use systemd-shared Signed-off-by: Marc-Antoine Perennou marc-anto...@perennou.com --- Makefile.am| 1 + configure.ac | 10 ++ units/u...@.service.in | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d013dfd..8030c5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4072,6 +4072,7 @@ substitutions = \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|SUSHELL=$(SUSHELL)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \ + '|PAM_NAME=$(PAM_NAME)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ '|MKDIR_P=$(MKDIR_P)|' \ diff --git a/configure.ac b/configure.ac index 759073a..c1d2dac 100644 --- a/configure.ac +++ b/configure.ac @@ -404,6 +404,15 @@ AC_SUBST(PAM_LIBS) AM_CONDITIONAL([HAVE_PAM], [test x$have_pam != xno]) # -- +AC_ARG_WITH([pam-name], +AS_HELP_STRING([--with-pam-name=NAME], +[Specify the PAM session name to set up a session as]), +[PAM_NAME=$withval], +[PAM_NAME=systemd-shared]) + +AC_SUBST(PAM_NAME) + +# -- AC_ARG_ENABLE([acl], AS_HELP_STRING([--disable-acl],[Disable optional ACL support]), [case ${enableval} in @@ -1027,6 +1036,7 @@ AC_MSG_RESULT([ Installation Python: ${PYTHON_BINARY} firmware path: ${FIRMWARE_PATH} PAM modules dir: ${with_pamlibdir} +PAM session name:${with_pam_name} D-Bus policy dir:${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir:${with_dbussystemservicedir} diff --git a/units/u...@.service.in b/units/u...@.service.in index 8f9a3b3..ce53d31 100644 --- a/units/u...@.service.in +++ b/units/u...@.service.in @@ -11,7 +11,7 @@ After=systemd-user-sessions.service [Service] User=%I -PAMName=systemd-shared +PAMName=@PAM_NAME@ Type=notify ExecStart=-@rootlibexecdir@/systemd --user Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket -- 1.8.3.3 ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] build: allow specifying a custom pam session name
On Fri, Jul 26, 2013 at 12:28 AM, Marc-Antoine Perennou marc-anto...@perennou.com wrote: for distribution now wanting to use systemd-shared Could you explain a bit more why this needs to be configurable? What's the usecase? Cheers, Tom ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] build: allow specifying a custom pam session name
On 26 July 2013 01:10, Tom Gundersen t...@jklm.no wrote: On Fri, Jul 26, 2013 at 12:28 AM, Marc-Antoine Perennou marc-anto...@perennou.com wrote: for distribution now wanting to use systemd-shared Could you explain a bit more why this needs to be configurable? What's the usecase? Cheers, Tom Oh, there is obviously a typo, it should be not and not now. It will allow distribution to use their already available pam session, like login-local or such, for example. + I don't think systemd-shared is really an explicit name for a pam session ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel