x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2goserver.git - build-main (branch) updated: 4.0.0.1-11-g98fa38c
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 98fa38c879da3ee1663f8d076163ff365adb63bd (commit) from 219e46526ad576e5d2866ef93d67a7aba8dd0c3a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ----- x2goserver/etc/x2goagent.options | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ff7e280..654403a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,11 +8,6 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). - [ Mike Gabriel ] - * New upstream version (4.0.0.2): - - As LP issue #985202 has been fixed, we revert back to keeping the XFIXES - extension enabled by default. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options index bc6c510..afe12f9 100644 --- a/x2goserver/etc/x2goagent.options +++ b/x2goserver/etc/x2goagent.options @@ -7,9 +7,7 @@ X2GO_NXAGENT_DEFAULT_OPTIONS="" # Disable XFIXES. # Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202 # -# As LP issue #985202 has been fixed, we revert back to keeping the XFIXES extension -# enabled by default. -#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES" +X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES" # Disable GLX, the old mesa version is hopelessly outdated anyways. # Unbreaks the gnome3 control center hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-2-ge8b78ed
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via e8b78edd63056c33fd0053ab00fe9f2624f727da (commit) from 7f482404a7a6966a4b2a2687c445b853376e310a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-xsession/etc/Xsession | 8 ++++++++ x2goserver/VERSION.x2goserver | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ce3e5b..1e277a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:26:09 +0100 + x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low [ Bernard Cafarelli ] diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 9fd5104..94c841e 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -49,6 +49,14 @@ internal_errormsg () { "<x2go-dev(a)lists.x2go.org>." } +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + # initialize variables for use by all session scripts OPTIONFILE=/etc/x2go/Xsession.options diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 4b0a782..33d19b9 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-1-g7f48240
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 7f482404a7a6966a4b2a2687c445b853376e310a (commit) from 6a78a843e29b9169ed7e64735908f308eacd4951 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 4b0a782..33d19b9 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 4b0a782..33d19b9 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 4b0a782..33d19b9 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 4b0a782..33d19b9 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 4b0a782..33d19b9 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - build-main (branch) updated: 4.0.0.1-3-g0111e55
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, build-main has been updated via 0111e551998a901a9d97101cb3a30c5cd790bf0e (commit) from e8b78edd63056c33fd0053ab00fe9f2624f727da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 4b0a782..33d19b9 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.0.1 \ No newline at end of file +4.0.0.2 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-19-g498e2b7
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, release/4.0.0.x has been updated via 498e2b7e5a8fa9216a57f2234f57f6a6fa7ed261 (commit) from 1341d206bfb573e3b25d8e22f273daf508a1c107 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 498e2b7e5a8fa9216a57f2234f57f6a6fa7ed261 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:55:01 2013 +0200 release 4.0.0.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 89ec4ee..3548efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.2): @@ -21,7 +21,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + Create session log symlink after launching x2goagent. Fix order of target and symlink name when executing the command. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 00:54:34 +0200 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-157-gdfa5930
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, master has been updated via dfa5930ccce0cecc922150899606e891f81929fd (commit) from 11d25fa4123aec1e20bde287656c6be47258062b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dfa5930ccce0cecc922150899606e891f81929fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:52:52 2013 +0200 Create session log symlink after launching x2goagent. Fix order of target and symlink name when executing the command. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c0dd4d9..0a32e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,8 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). + + Create session log symlink after launching x2goagent. Fix order of target + and symlink name when executing the command. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5b97fb4..752695e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,8 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-18-g1341d20
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, release/4.0.0.x has been updated via 1341d206bfb573e3b25d8e22f273daf508a1c107 (commit) from 011d14ae076ba6fec96cd1e019c4f82444ab0f9f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1341d206bfb573e3b25d8e22f273daf508a1c107 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:52:52 2013 +0200 Create session log symlink after launching x2goagent. Fix order of target and symlink name when executing the command. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2cf2dde..89ec4ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). + + Create session log symlink after launching x2goagent. Fix order of target + and symlink name when executing the command. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 45b3ba5..83e559d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,8 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-154-g8547d29
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, master has been updated via 8547d2998166ff27225d3ad6d7cc22deabf3b29b (commit) from 42264c88d7885474ebe3763b2991681ddfcfa69a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8547d2998166ff27225d3ad6d7cc22deabf3b29b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:18:51 2013 +0200 clean up debug output ----------------------------------------------------------------------- Summary of changes: libx2go-server-db-perl/Makefile | 1 - 1 file changed, 1 deletion(-) The diff of changes is: diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 459e485..3c6a003 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -39,7 +39,6 @@ all: clean build build: build-arch build-indep build-arch: - echo $(PREFIX) $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper.pl\" -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c build-indep: hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-17-g011d14a
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, release/4.0.0.x has been updated via 011d14ae076ba6fec96cd1e019c4f82444ab0f9f (commit) from 3f7c053a58aa2e38c93935c9ac3ac570896e6506 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:41:32 2013 +0200 Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to x2gosqlitewrapper.pl during build via defining a macro in the Makefile. Thanks to Richard Weinberger for spotting this!!! ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- debian/changelog | 3 +++ debian/rules | 4 +-- x2goserver/Makefile | 4 +-- x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- 5 files changed, 12 insertions(+), 55 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 3be40f9..588084f 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go SHAREDIR=$(PREFIX)/share/x2go diff --git a/debian/changelog b/debian/changelog index 470a502..2cf2dde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if not present. (Fixes: #200). + - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to + x2gosqlitewrapper.pl during build via defining a macro in the Makefile. + Thanks to Richard Weinberger for spotting this!!! /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/debian/rules b/debian/rules index b32e08d..5bb94b2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,10 @@ #!/usr/bin/make -f %: - dh $@ + PREFIX=/usr dh $@ override_dh_auto_install: - make -f Makefile build-arch + PREFIX=/usr make -f Makefile build-arch override_dh_auto_clean: rm -fv x2gosqlitewrapper diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 4287478..e9d56e6 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -15,7 +15,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= -PREFIX=/usr/local +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin @@ -41,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index a134efc..ad95eff 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -21,58 +21,12 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <libgen.h> -#include <errno.h> - int main( int argc, char *argv[] ) { - char * x2gosqlitewrapper = NULL; - size_t path_max; - -/* - The following snippet is taken from the realpath manpage -*/ -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (".", _PC_PATH_MAX); - if (path_max <= 0){ - path_max = 4096; - } -#endif - { - // allocate dynamic buffer in stack: this needs C99 or gnu?? - char buffer[path_max]; - ssize_t rvrl; - int rvap; - - // resolve link of /proc/self/exe to find out where we are - rvrl = readlink("/proc/self/exe", buffer, path_max); - if(rvrl == -1){ - perror("readlink(\"/proc/self/exe\",buffer,path_max)"); - exit(EXIT_FAILURE); - } - if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); - exit(EXIT_FAILURE); - } - - // derive the full path of x2gosqlitewrapper.pl from path of this binary - rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); - if(rvap == -1){ - fprintf(stderr, "Failed to allocate memory calling asprintf\n"); - exit(EXIT_FAILURE); - } - - // execute the script, running with user-rights of this binary - execv(x2gosqlitewrapper, argv); - } + char x2gosqlitewrapper[] = TRUSTED_BINARY; - // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); - return EXIT_FAILURE; + argv[0] = "x2gosqlitewrapper.pl"; + // execute the script, running with user-rights of this binary + execv(x2gosqlitewrapper, argv); } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-153-g42264c8
by git-admin＠x2go.org 18 May '13

18 May '13

The branch, master has been updated via 42264c88d7885474ebe3763b2991681ddfcfa69a (commit) from 8fd306d77cd3189d3084659617cb9d31b1d8e89f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42264c88d7885474ebe3763b2991681ddfcfa69a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 19 00:18:24 2013 +0200 Security fix for setgid wrapper libx2go-server-db-sqlite3-wrapper.c. Hard- code path to libx2go-server-db-sqlite3-wrapper.pl during build via defining a macro in the Makefile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ debian/rules | 4 +- libx2go-server-db-perl/Makefile | 3 +- .../src/libx2go-server-db-sqlite3-wrapper.c | 48 ++------------------ 4 files changed, 11 insertions(+), 47 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e30e866..4922ddb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,9 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low script is called without session as first argument and $X2GO_SESSION not set. (Fixes: #82). * Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117). + * Security fix for setgid wrapper libx2go-server-db-sqlite3-wrapper.c. Hard- + code path to libx2go-server-db-sqlite3-wrapper.pl during build via + defining a macro in the Makefile. [ Otto Kjell ] * New upstream version (4.1.0.0): diff --git a/debian/rules b/debian/rules index 43139c0..b671ca3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,10 @@ #!/usr/bin/make -f %: - dh $@ + PREFIX=/usr dh $@ override_dh_auto_build: - PERL_INSTALLDIRS=vendor dh_auto_build + PREFIX=/usr PERL_INSTALLDIRS=vendor dh_auto_build override_dh_auto_install: $(MAKE) -f Makefile build-arch diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 67767b8..459e485 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -39,7 +39,8 @@ all: clean build build: build-arch build-indep build-arch: - $(CC) $(CFLAGS) $(LDFLAGS) -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c + echo $(PREFIX) + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper.pl\" -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c build-indep: diff --git a/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c index fcff47e..093abfd 100644 --- a/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c +++ b/libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c @@ -28,51 +28,11 @@ #include <errno.h> int main( int argc, char *argv[] ) { - char * x2gosqlitewrapper = NULL; - size_t path_max; - -/* - The following snippet is taken from the realpath manpage -*/ -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (".", _PC_PATH_MAX); - if (path_max <= 0){ - path_max = 4096; - } -#endif - { - // allocate dynamic buffer in stack: this needs C99 or gnu?? - char buffer[path_max]; - ssize_t rvrl; - int rvap; - - // resolve link of /proc/self/exe to find out where we are - rvrl = readlink("/proc/self/exe", buffer, path_max); - if(rvrl == -1){ - perror("readlink(\"/proc/self/exe\",buffer,path_max)"); - exit(EXIT_FAILURE); - } - if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); - exit(EXIT_FAILURE); - } - - // derive the full path of libx2go-server-db-sqlite3-wrapper.pl from path of this binary - rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "libx2go-server-db-sqlite3-wrapper.pl"); - if(rvap == -1){ - fprintf(stderr, "Failed to allocate memory calling asprintf\n"); - exit(EXIT_FAILURE); - } - - // execute the script, running with user-rights of this binary - execv(x2gosqlitewrapper, argv); - } + char x2gosqlitewrapper[] = TRUSTED_BINARY; - // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); - return EXIT_FAILURE; + argv[0] = "libx2go-server-db-sqlite3-wrapper.pl"; + // execute the script, running with user-rights of this binary + execv(x2gosqlitewrapper, argv); } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits