capabilities: Move global capabilities_t instance to libstrongswan

src/charon-nm/charon-nm.c

@@ -122,13 +122,13 @@ static void segv_handler(int signal)
 static bool lookup_uid_gid()
 {
 #ifdef IPSEC_USER
-	if (!charon->caps->resolve_uid(charon->caps, IPSEC_USER))
+	if (!lib->caps->resolve_uid(lib->caps, IPSEC_USER))
 	{
 		return FALSE;
 	}
 #endif
 #ifdef IPSEC_GROUP
-	if (!charon->caps->resolve_gid(charon->caps, IPSEC_GROUP))
+	if (!lib->caps->resolve_gid(lib->caps, IPSEC_GROUP))
 	{
 		return FALSE;
 	}
@@ -214,7 +214,7 @@ int main(int argc, char *argv[])
 	}
 	lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
-	if (!charon->caps->drop(charon->caps))
+	if (!lib->caps->drop(lib->caps))
 	{
 		DBG1(DBG_DMN, "capability dropping failed - aborting charon-nm");
 		goto deinit;

src/charon-nm/nm/nm_backend.c

@@ -142,7 +142,7 @@ static bool nm_backend_init()
 	}
 
 	/* bypass file permissions to read from users ssh-agent */
-	if (!charon->caps->keep(charon->caps, CAP_DAC_OVERRIDE))
+	if (!lib->caps->keep(lib->caps, CAP_DAC_OVERRIDE))
 	{
 		DBG1(DBG_CFG, "NM backend requires CAP_DAC_OVERRIDE capability");
 		nm_backend_deinit();