[X2Go-Commits] [x2goserver] 07/07: libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c: revamp wrapper, alike to what was done in x2gobroker.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit d44ab9c2302a4d5eb8aa1ad0ff02e28f4bfc8cfa
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Nov 29 02:22:25 2018 +0100

    libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c: revamp wrapper, alike to what was done in x2gobroker.
---
 debian/changelog                                   |  2 ++
 .../src/libx2go-server-db-sqlite3-wrapper.c        | 23 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c03f2eb..c377869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,6 +81,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
     - misc: switch to HTTPS-based URLs where appropriate.
     - misc: update Oleksandr's email address.
     - misc manpages: pre-release date update.
+    - libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c: revamp
+      wrapper, alike to what was done in x2gobroker.
   * x2goserver.spec:
     + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around
       a bug.
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 2016833..d7351a7 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
@@ -21,13 +21,28 @@
  */
 
 #include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
-int main( int argc, char *argv[] ) {
-
-	char x2gosqlitewrapper[] = TRUSTED_BINARY;
+int main(int argc, char **argv) {
+	const char *x2gosqlitewrapper = TRUSTED_BINARY;
 
 	argv[0] = "libx2go-server-db-sqlite3-wrapper.pl";
 	// execute the script, running with user-rights of this binary
-	return execv(x2gosqlitewrapper, argv);
+	int ret = execv(x2gosqlitewrapper, argv);
+	int saved_errno = errno;
+
+	if (ret) {
+		fprintf (stderr, "unable to execute script '");
+		fprintf (stderr, "%s", TRUSTED_BINARY);
+		fprintf (stderr, "': ");
+		fprintf (stderr, "%s", strerror (saved_errno));
+
+		return (EXIT_FAILURE);
+	}
 
+	/* Should not be reached. */
+	return (EXIT_SUCCESS);
 }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git