This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from d00f3f0 x2goserver/bin/x2goruncommand: fix typo in IceWM branch. new 4d31a29 Add support for X2Go KDrive. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: X2Go/Server/DB/SQLite3.pm | 2 +- debian/changelog | 4 ++++ x2goserver/bin/x2gostartagent | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4d31a294f7c570d92d9bb28d20e8306e491c3875 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Dec 21 17:13:59 2018 +0100 Add support for X2Go KDrive. --- X2Go/Server/DB/SQLite3.pm | 2 +- debian/changelog | 4 ++++ x2goserver/bin/x2gostartagent | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index 3dc1853..e6fb22b 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -682,7 +682,7 @@ sub check_user $realuser =~ s/\\//; # perform the user check - $user =~ s/($realuser-[0-9]{2,}-[0-9]{10,}_st(D|R).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$realuser.*)/$realuser/; + $user =~ s/($realuser-[0-9]{2,}-[0-9]{10,}_st(D|R|K).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$realuser.*)/$realuser/; $user eq $realuser or die "$realuser is not authorized"; } diff --git a/debian/changelog b/debian/changelog index be5013a..4e325cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,6 +93,10 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium * debian/x2goserver.install: + Install bin/x2goupdateoptionsstring. + [ Oleksandr Shneyder ] + * New upstream version (4.1.0.4): + - Add support for X2Go KDrive. + [ Tom Ruzicka ] * debian/po: Add Czech debconf translation. diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 8dc6e16..0c7cd2e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -211,6 +211,8 @@ COLORDEPTH="$(awk '{split($0,a,"-depth_"); print a[2]}' <<< "${X2GO_TYPE}")" SESSION_TYPE='D' NOEXITPARAM='' +AGENTBIN=x2goagent + if [[ "${X2GO_STYPE}" = 'R' ]]; then SESSION_TYPE='R' elif [[ "${X2GO_STYPE}" = 'P' ]]; then @@ -218,6 +220,9 @@ elif [[ "${X2GO_STYPE}" = 'P' ]]; then NOEXITPARAM='-norootlessexit' elif [[ "${X2GO_STYPE}" = 'S' ]]; then SESSION_TYPE='S' +elif [[ "${X2GO_STYPE}" = 'K' ]]; then + SESSION_TYPE='K' + AGENTBIN='x2gokdrive' fi if [[ -z "${X2GO_CLIENT}" ]]; then @@ -462,9 +467,9 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') -SESSION_TYPE ('-${SESSION_TYPE}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') -shadow SHADOW_DESKTOP ('${SHADOW_DESKTOP}') -shadowmode SHADOW_MODE ('${SHADOW_MODE}') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGEN [...] NX_TEMP='/tmp' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} -${SESSION_TYPE} -auth "${XAUTHORITY}" -shadow ${SHADOW_DESKTOP} -shadowmode ${SHADOW_MODE} ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else - # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use + # set NX_TEMP to /tmp, make sure agent starts when pam_tmpdir.so is in use "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" ('\"${ [...] - NX_TEMP='/tmp' x2goagent ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & + NX_TEMP='/tmp' ${AGENTBIN} ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi ln -s -- "${SESSION_DIR}" "${X2GO_ROOT}/C-${SESSION_NAME}" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org