Imported Upstream version 4.5.2

6 files changed, 9 insertions, 4 deletions

diff --git a/src/starter/Makefile.in b/src/starter/Makefile.in
index f1c370ad9..72adbf7bc 100644
--- a/src/starter/Makefile.in
+++ b/src/starter/Makefile.in
@@ -227,6 +227,8 @@ nm_ca_dir = @nm_ca_dir@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
 pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
@@ -250,6 +252,7 @@ soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
diff --git a/src/starter/args.c b/src/starter/args.c
index 87307f1aa..4d8003aab 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -542,6 +542,7 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
 				}
 			}
 		}
+		/* fall through */
 	default:
 		return TRUE;
 	}
diff --git a/src/starter/interfaces.c b/src/starter/interfaces.c
index ef26cdce5..4a2ae0a57 100644
--- a/src/starter/interfaces.c
+++ b/src/starter/interfaces.c
@@ -153,6 +153,7 @@ get_defaultroute(defaultroute_t *defaultroute)
 			}
 
 			strncpy(defaultroute->iface, req.ifr_name, IFNAMSIZ);
+			defaultroute->iface[IFNAMSIZ-1] = '\0';
 			defaultroute->addr.u.v4 = *((struct sockaddr_in *) &req.ifr_addr);
 			defaultroute->nexthop.u.v4.sin_family = AF_INET;
 
diff --git a/src/starter/invokecharon.c b/src/starter/invokecharon.c
index f8aa5e6a9..e88939415 100644
--- a/src/starter/invokecharon.c
+++ b/src/starter/invokecharon.c
@@ -147,7 +147,7 @@ int starter_start_charon (starter_config_t *cfg, bool no_fork, bool attach_gdb)
 		char *pos = cfg->setup.charondebug;
 		char *buf_pos = buffer;
 
-		while (pos && sscanf(pos, "%4s %d,", type, &level) == 2)
+		while (pos && sscanf(pos, "%3s %d,", type, &level) == 2)
 		{
 			snprintf(buf_pos, buffer + sizeof(buffer) - buf_pos, "--debug-%s", type);
 			arg[argc++] = buf_pos;
diff --git a/src/starter/starter.c b/src/starter/starter.c
index c3ba54f1d..fcef2f7ff 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -714,7 +714,7 @@ int main (int argc, char **argv)
 
 					if (conn->startup == STARTUP_START)
 					{
-						if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
+						if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
 						{
 							if (starter_charon_pid())
 							{
@@ -731,7 +731,7 @@ int main (int argc, char **argv)
 					}
 					else if (conn->startup == STARTUP_ROUTE)
 					{
-						if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
+						if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
 						{
 							if (starter_charon_pid())
 							{
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index f251667c7..7272b2530 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -118,7 +118,7 @@ static char* connection_name(starter_conn_t *conn)
 
 	if (streq(conn->name, "%auto"))
 	{
-		sprintf(buf, "conn_%ld", conn->id);
+		sprintf(buf, "conn_%lu", conn->id);
 		return buf;
 	}
 	return conn->name;