From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 25 Jun 2013 13:03:51 +0000 (+0200)
Subject: capabilities: Return effective UID/GID if user did not configure anything
X-Git-Tag: 5.1.0dr1~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2ffde4ae8ceaddeab8b6f740804536033153e6;p=thirdparty%2Fstrongswan.git

capabilities: Return effective UID/GID if user did not configure anything
---

diff --git a/src/libstrongswan/utils/capabilities.c b/src/libstrongswan/utils/capabilities.c
index d1ab686a4f..8bc75b6336 100644
--- a/src/libstrongswan/utils/capabilities.c
+++ b/src/libstrongswan/utils/capabilities.c
@@ -208,13 +208,13 @@ METHOD(capabilities_t, keep, bool,
 METHOD(capabilities_t, get_uid, uid_t,
 	private_capabilities_t *this)
 {
-	return this->uid;
+	return this->uid ?: geteuid();
 }
 
 METHOD(capabilities_t, get_gid, gid_t,
 	private_capabilities_t *this)
 {
-	return this->gid;
+	return this->gid ?: getegid();
 }
 
 METHOD(capabilities_t, set_uid, void,