diff options
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/scripts')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials | 10 |
1 files changed, 8 insertions, 2 deletions
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 7d80abe0..f23d85a1 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 @@ -16,9 +16,15 @@ if [ -n "$TEMP_HOME_DIR" ]; then # Figure out username XUSER="${REAL_ACCOUNT}" [ -z "$XUSER" ] && XUSER="${PAM_USER}" - # Guess domain + # Figure out domain XDOMAIN= - if [ -n "$PERSISTENT_HOME_DIR" ]; then + # Take explicitly configured domain + if [ -s "/opt/openslx/inc/shares" ]; then + . /opt/openslx/inc/shares + XDOMAIN="${SHARE_DOMAIN}" + fi + # Guess domain + 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') fi if [ -z "$XDOMAIN" ]; then |