diff options
| author | Jonathan Bauer | 2018-04-11 16:40:57 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2018-04-11 16:40:57 +0200 |
| commit | 318039fd066d349f22e5663b9950eb6779383b8b (patch) | |
| tree | 55528a0429c758e028206b83cf74b2e1400122dd | |
| parent | [run-virt] check for /tmp/virt not in RAM (diff) | |
| download | mltk-318039fd066d349f22e5663b9950eb6779383b8b.tar.gz mltk-318039fd066d349f22e5663b9950eb6779383b8b.tar.xz mltk-318039fd066d349f22e5663b9950eb6779383b8b.zip | |
[*] LDAP_DOMAIN_OVERRIDE -> SHARE_DOMAIN
3 files changed, 5 insertions, 5 deletions
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback index ea3b4ae9..144b78ba 100644 --- a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback +++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback @@ -29,7 +29,7 @@ if [ "$MOUNT" = "cifs" ]; then if [ -n "$LDAP_BASE" ]; then XDOMAIN=$( echo "$LDAP_BASE" | grep -o -E -i 'DC=([^,;]+)' | head -n 1 | cut -c 4- ) fi - if [ -z "$LDAP_DOMAIN_OVERRIDE" ]; then + if [ -z "$SHARE_DOMAIN" ]; then XDOMAIN="$XDOMAIN #" fi @@ -44,7 +44,7 @@ PIDS= CNT=0 for opt in $OPTION_LIST; do # try with and without explicit domain argument - for dom in $LDAP_DOMAIN_OVERRIDE $XDOMAIN; do # No quotes + for dom in $SHARE_DOMAIN $XDOMAIN; do # No quotes CNT=$(( CNT + 1 )) FILE=$(mktemp) LOGFILES="$LOGFILES $FILE" diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config b/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config index b8e43331..7de43b7e 100755 --- a/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config +++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config @@ -40,7 +40,7 @@ write_sssd_config() { HERE for file in /opt/openslx/pam/slx-ldap.d/*; do [ -f "$file" ] || continue - unset LDAP_ATTR_MOUNT_OPTS LDAP_URI LDAP_BASE LDAP_DOMAIN_OVERRIDE LDAP_CACERT + unset LDAP_ATTR_MOUNT_OPTS LDAP_URI LDAP_BASE SHARE_DOMAIN LDAP_CACERT . "$file" [ -z "$LDAP_URI" ] && continue [ -z "$LDAP_BASE" ] && continue diff --git a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials b/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials index 61df37f8..cdf5ed2c 100644 --- a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials +++ b/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials @@ -23,8 +23,8 @@ if [ -n "$TEMP_HOME_DIR" ]; then if [ -d "/opt/openslx/pam/slx-ldap.d" ]; then # New pretty approach - modular with multiple auth sources - if [ -n "$LDAP_DOMAIN_OVERRIDE" ]; then - [ "x$LDAP_DOMAIN_OVERRIDE" != "x#" ] && XDOMAIN="$LDAP_DOMAIN_OVERRIDE" + if [ -n "$SHARE_DOMAIN" ]; then + [ "x$SHARE_DOMAIN" != "x#" ] && XDOMAIN="$SHARE_DOMAIN" else if [ -z "$XDOMAIN" ] && [ -n "$PERSISTENT_HOME_DIR" ]; then XDOMAIN=$(grep -F " ${PERSISTENT_HOME_DIR} " "/proc/mounts" | grep -m1 -F 'domain=' | sed -r 's/^.*[ ,]domain=([^ ,]*)[ ,].*$/\1/g') |