diff options
| author | Simon Rettberg | 2018-03-09 14:22:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-03-09 14:22:03 +0100 |
| commit | 9deea6d5b4681fbb0226f5d178cf8897185ec86c (patch) | |
| tree | adb20c6e3379850499f2a43e077f7b07d7633a27 /core/modules/pam-slx-plug | |
| parent | [run-virt] pw_daemon: Remove debug output (diff) | |
| download | mltk-9deea6d5b4681fbb0226f5d178cf8897185ec86c.tar.gz mltk-9deea6d5b4681fbb0226f5d178cf8897185ec86c.tar.xz mltk-9deea6d5b4681fbb0226f5d178cf8897185ec86c.zip | |
[pam-slx-plug] Add missing homeDirectory to ldapsearch, fix mount.d path
Diffstat (limited to 'core/modules/pam-slx-plug')
| -rw-r--r-- | core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap | 4 | ||||
| -rwxr-xr-x | core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap b/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap index fd2d4a3c..7fcf1383 100644 --- a/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap +++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap @@ -60,7 +60,7 @@ run_auth() { for retries in 0 1 1 2 3 END; do ldapsearch -x -LLL -l 3 -o nettimeout=3 -o ldif-wrap=no \ -H "$LDAP_URI" -b "$LDAP_BASE" uid="${PAM_USER}" \ - dn distinguishedName homeMount realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_ANON}" + dn distinguishedName homeMount homeDirectory realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_ANON}" RET=$? case "$RET" in 0) break # OK @@ -104,7 +104,7 @@ run_auth() { # unquoted LDAP_ATTR_* ldapsearch -x -LLL -l 5 -o nettimeout=5 -o ldif-wrap=no \ -H "$LDAP_URI" -b "$LDAP_BASE" uid="${PAM_USER}" -y "${PW}" -D "$BINDDN" uid="${PAM_USER}" \ - homeMount realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_USER}" + homeMount homeDirectory realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_USER}" RET=$? rm -f -- "${PW}" case "$RET" in diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth index 9883bdaf..00fa856e 100755 --- a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth +++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth @@ -148,7 +148,7 @@ if ! isHomeMounted; then if ! mkdir -p "${PERSISTENT_HOME_DIR}"; then slxlog "pam-global-mkpersistent" "Could not create '${PERSISTENT_HOME_DIR}'." else - for mount_file in /opt/openslx/pam/mount-persistent.d/*; do + for mount_file in /opt/openslx/pam/mount.d/*; do [ -f "$mount_file" ] || continue . "$mount_file" if isHomeMounted; then |