X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=1c26631291616ba09eaebce05fa13e2aefcfab49;hb=f3ff15d158dad32a9ab21f9895eaf3cc162c88c7;hp=2c2015aa2d5b8206bca9052320553f8da78d431d;hpb=8cf66a2b6551d770a8aedf1301bcec2270041785;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index 2c2015aa2..1c2663129 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -153,13 +153,14 @@ int _open(void *_data)
 static
 int child_run_as(void *_data)
 {
+	int ret;
 	struct run_as_data *data = _data;
-	size_t writelen, writeleft, index;
+	ssize_t writelen;
+	size_t writeleft, index;
 	union {
 		int i;
 		char c[sizeof(int)];
 	} sendret;
-	int ret;
 
 	/*
 	 * Child: it is safe to drop egid and euid while sharing the
@@ -316,18 +317,8 @@ int run_as_noclone(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 static
 int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 {
-	if (!getenv("LTTNG_DEBUG_NOCLONE")) {
-		int ret;
-
-		DBG("Using run_as_clone");
-		pthread_mutex_lock(&lttng_libc_state_lock);
-		ret = run_as_clone(cmd, data, uid, gid);
-		pthread_mutex_unlock(&lttng_libc_state_lock);
-		return ret;
-	} else {
-		DBG("Using run_as_noclone");
-		return run_as_noclone(cmd, data, uid, gid);
-	}
+	DBG("Using run_as_noclone");
+	return run_as_noclone(cmd, data, uid, gid);
 }
 
 int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)