summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DISTRO_PORTING3
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--src/journal/journald-server.c2
-rw-r--r--src/login/systemd-user.m42
5 files changed, 10 insertions, 2 deletions
diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 9f61bd6de6..51a244389d 100644
--- a/DISTRO_PORTING
+++ b/DISTRO_PORTING
@@ -48,6 +48,9 @@ PAM:
/etc/security/limits.conf will not be read unless you load pam_limits.
Make sure you add modules your distro expects from user services.
+ Pass --with-pamconfdir=no to ./configure to avoid installing this file
+ and instead install your own.
+
CONTRIBUTING UPSTREAM:
We generally do no longer accept distribution-specific
diff --git a/Makefile.am b/Makefile.am
index b09b0cf167..e740512f98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5902,8 +5902,10 @@ pam_systemd_la_LIBADD = \
pamlib_LTLIBRARIES = \
pam_systemd.la
+if ENABLE_PAM_CONFIG
dist_pamconf_DATA = \
src/login/systemd-user
+endif
EXTRA_DIST += \
src/login/systemd-user.m4
diff --git a/configure.ac b/configure.ac
index ccd212ef13..0e87adc38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1507,9 +1507,10 @@ AC_ARG_WITH([pamlibdir],
AX_NORMALIZE_PATH([with_pamlibdir])
AC_ARG_WITH([pamconfdir],
- AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration]),
+ AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration (pass no to disable installing)]),
[],
[with_pamconfdir=${sysconfdir}/pam.d])
+AM_CONDITIONAL(ENABLE_PAM_CONFIG, [test "$with_pamconfdir" != "no"])
AX_NORMALIZE_PATH([with_pamconfdir])
AC_ARG_ENABLE([split-usr],
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 3224bdbf5f..381182fa2c 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -630,7 +630,7 @@ static bool shall_try_append_again(JournalFile *f, int r) {
return true;
case -ETXTBSY: /* Journal file is from the future */
- log_warning("%s: Journal file is from the future, rotateing.", f->path);
+ log_warning("%s: Journal file is from the future, rotating.", f->path);
return true;
default:
diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
index fe38b24fef..e33963b125 100644
--- a/src/login/systemd-user.m4
+++ b/src/login/systemd-user.m4
@@ -2,6 +2,8 @@
#
# Used by systemd --user instances.
+account required pam_unix.so
+
m4_ifdef(`HAVE_SELINUX',
session required pam_selinux.so close
session required pam_selinux.so nottys open