diff options
| author | Simon Rettberg | 2015-02-12 12:45:14 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-02-12 12:45:14 +0100 |
| commit | 05cd3389c4d7de4a44e7de93a028c2a4182d3486 (patch) | |
| tree | 33f6060ed4b5b06b10c2c1501df0c25f03b42bbb /data/ad/mountscript | |
| parent | [CreateAdConfig] Adapt to sssd (instead of nslcd) (diff) | |
| download | tmlite-bwlp-05cd3389c4d7de4a44e7de93a028c2a4182d3486.tar.gz tmlite-bwlp-05cd3389c4d7de4a44e7de93a028c2a4182d3486.tar.xz tmlite-bwlp-05cd3389c4d7de4a44e7de93a028c2a4182d3486.zip | |
Fix AD pam and scripts
Diffstat (limited to 'data/ad/mountscript')
| -rw-r--r-- | data/ad/mountscript | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/data/ad/mountscript b/data/ad/mountscript index 74c511e..a48ca3a 100644 --- a/data/ad/mountscript +++ b/data/ad/mountscript @@ -6,20 +6,24 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then - # determine fileserver and share for home directories - touch "/tmp/ldapsearch.${PAM_USER}" - chmod 0600 "/tmp/ldapsearch.${PAM_USER}" - ldapsearch -x -LLL uid="${PAM_USER}" homeMount > "/tmp/ldapsearch.${PAM_USER}" 2>/dev/null || \ - { slxlog "pam-ad-ldapquery" "Could not query LDAP server for parameters of user '${PAM_USER}'."; exit 1; } - VOLUME=$(cat "/tmp/ldapsearch.${PAM_USER}" | grep ^homeMount | head -n 1 | cut -d" " -f2) - [ -z "${VOLUME}" ] && slxlog "pam-ad-ldapvolume" "LDAP server did not provide 'homeMount'. Aborting mount for ${PAM_USER}." && exit 1 + if [ -z "$VOLUME" -o -z "$REAL_ACCOUNT" ]; then + # determine fileserver and share for home directories + touch "/tmp/ldapsearch.${PAM_USER}" + chmod 0600 "/tmp/ldapsearch.${PAM_USER}" + ldapsearch -x -LLL uid="${PAM_USER}" homeMount > "/tmp/ldapsearch.${PAM_USER}" 2>/dev/null || \ + { slxlog "pam-ad-ldapquery" "Could not query LDAP server for parameters of user '${PAM_USER}'."; exit 1; } + VOLUME=$(cat "/tmp/ldapsearch.${PAM_USER}" | grep ^homeMount | head -n 1 | cut -d" " -f2) + [ -z "${VOLUME}" ] && slxlog "pam-ad-ldapvolume" "LDAP server did not provide 'homeMount'. Aborting mount for ${PAM_USER}." && exit 1 + [ -z "$REAL_ACCOUNT" ] && REAL_ACCOUNT=$(cat "/tmp/ldapsearch.${PAM_USER}" | grep ^realAccount | head -n 1 | cut -d" " -f2) + [ -z "$REAL_ACCOUNT" ] && REAL_ACCOUNT="$PAM_USER" + fi - MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,sec=ntlm" + MOUNT_OPTS="-v -t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,sec=ntlm" SIGNAL=$(mktemp) rm -f -- "${SIGNAL}" - export USER="${PAM_USER}" + export USER="${REAL_ACCOUNT}" export PASSWD="${PAM_AUTHTOK}" ( mount ${MOUNT_OPTS} "${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) & @@ -30,11 +34,11 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then done if [ -e "${SIGNAL}" ]; then - slxlog "pam-reutlingen" "Mount of '${FILESERVER}/${PAM_USER}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" + slxlog "pam-ad-mount" "Mount of '${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" sleep 1 rm -f -- "${SIGNAL}" elif kill -9 "${MOUNT_PID}" 2>/dev/null; then - slxlog "pam-reutlingen" "Mount of '${FILESERVER}/${PAM_USER}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" + slxlog "pam-ad-mount" "Mount of '${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" sleep 1 else PERSISTENT_OK=yes |