diff options
| author | Simon Rettberg | 2017-02-22 15:39:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-02-22 15:39:33 +0100 |
| commit | 919293c316244b9508bd0d1d44d36c6fe53a1a39 (patch) | |
| tree | 8beb28d673ac2a61768e8721ba952560497175c7 /core/modules/run-virt/data/opt/openslx/scripts | |
| parent | [printergui] printergui.service: Added stage4.target to after (diff) | |
| download | mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.tar.gz mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.tar.xz mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.zip | |
[run-virt] Support passing credentials to runscript
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 |