[X2go-Commits] x2goserver.git - setuidwrapper (branch) updated: 3.0.99-2-81-ga694aac
X2go dev team
git-admin at x2go.org
Thu Jul 14 14:02:54 CEST 2011
The branch, setuidwrapper has been updated
via a694aaca92f9f8c6cbc81d200b09beb48b06b79d (commit)
via 04fc757c55d1e6a3f95b1e1058865569033d4bfb (commit)
via 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c (commit)
from 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (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 a694aaca92f9f8c6cbc81d200b09beb48b06b79d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 14 14:03:00 2011 +0200
fix setuidwrapper script (accept options as x2gosqlitewrapper.pl does)
commit 04fc757c55d1e6a3f95b1e1058865569033d4bfb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 14 14:02:29 2011 +0200
rebuilt html man pages
commit 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 14 14:00:17 2011 +0200
Fixup for Conflicts stanza, make x2goserver-extensions binNMUable again.
-----------------------------------------------------------------------
Summary of changes:
debian/control | 6 +++---
.../html/man8/x2gosetkeyboard.8.html | 2 +-
.../.build_man2html/html/man8/x2goversion.8.html | 2 +-
.../html/man8/x2gocleansessions.8.html | 2 +-
.../html/man8/x2gocmdexitmessage.8.html | 2 +-
.../html/man8/x2golistdesktops.8.html | 2 +-
.../html/man8/x2golistsessions.8.html | 2 +-
.../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +-
.../.build_man2html/html/man8/x2goprint.8.html | 2 +-
.../html/man8/x2goresume-session.8.html | 2 +-
.../html/man8/x2goruncommand.8.html | 2 +-
.../html/man8/x2goshowblocks.8.html | 2 +-
.../html/man8/x2gostartagent.8.html | 2 +-
.../html/man8/x2gosuspend-session.8.html | 2 +-
.../html/man8/x2goterminate-session.8.html | 2 +-
.../html/man8/x2goumount-session.8.html | 2 +-
x2goserver/x2gosqlitewrapper.c | 6 ++++--
17 files changed, 22 insertions(+), 20 deletions(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index ceb7be3..3919e2a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary
Package: x2goserver
Architecture: any
Depends:
+ ${shlibs:Depends},
${misc:Depends},
x2goagent,
- perl-suid,
lsof,
openssh-client,
openssh-server,
@@ -37,7 +37,7 @@ Recommends:
x11-xserver-utils,
xinit,
x2goserver-extensions (= ${source:Version})
-ConflictsB:
+Conflicts:
x2goserver-one,
x2goserver-home,
x2goprint
@@ -65,7 +65,7 @@ Package: x2goserver-extensions
Architecture: all
Depends:
${misc:Depends},
- x2goserver (= ${source:Version}),
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
x11-xkb-utils
Description: X2go server daemon scripts (extensions)
X2go is a serverbased computing environment with
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
index b533a4f..d787004 100644
--- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
@@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
index 453e0a5..eeae817 100644
--- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
@@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
index 08725c0..e25e5d8 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
index eac9b6d..c7cab5d 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
index fe856a4..843c9a0 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
index bce89d4..5f938d9 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
index d4e6bf7..e187787 100644
--- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
index 501439b..fe9e175 100644
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
index 16b27b9..a6f792d 100644
--- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
index a8b934e..4c2720d 100644
--- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
index a8b934e..4c2720d 100644
--- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
index 9f7ce24..45fb4f5 100644
--- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
@@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
index 5a8eeb9..2fe037d 100644
--- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
index 9010bfd..ef27d29 100644
--- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
index f39b688..68f48b9 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 07:17:02 GMT, July 13, 2011
+Time: 11:58:19 GMT, July 14, 2011
</BODY>
</HTML>
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
index b23037b..b702aa7 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2gosqlitewrapper.c
@@ -25,7 +25,8 @@
#include <unistd.h>
#include <libgen.h>
-int main() {
+int main( int argc, char *argv[] ) {
+
char buffer[BUFSIZ];
char * x2gosqlitewrapper = NULL;
@@ -36,8 +37,9 @@ int main() {
asprintf(&x2gosqlitewrapper, "%s/%s", dirname(dirname(buffer)), "lib/x2go/x2gosqlitewrapper.pl");
// execute the script, taking setuid bit into consideration if set...
- execl(x2gosqlitewrapper, "");
+ execv(x2gosqlitewrapper, argv);
// fake a successful return value
return 0;
+
}
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).
More information about the x2go-commits
mailing list