From 6e0c82141f6c661d2309983b62576d696139838d Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 19 Apr 2011 16:13:28 +0200
Subject: [PATCH] pluto: Replaced some strcpy usages with strncpy.

---
 src/libfreeswan/satot.c | 12 ++++++------
 src/pluto/connections.c |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libfreeswan/satot.c b/src/libfreeswan/satot.c
index e70036482..a3feb1591 100644
--- a/src/libfreeswan/satot.c
+++ b/src/libfreeswan/satot.c
@@ -77,7 +77,7 @@ size_t dstlen;
 			break;			/* NOTE BREAK OUT */
 		}
 	if (pre == NULL) {		/* unknown protocol */
-		strcpy(unk, "unk");
+		strncpy(unk, "unk", sizeof(unk));
 		(void) ultot((unsigned char)sa->proto, 10, unk+strlen(unk),
 						sizeof(unk)-strlen(unk));
 		pre = unk;
@@ -86,9 +86,9 @@ size_t dstlen;
 	if (strcmp(pre, PASSTHROUGHTYPE) == 0 &&
 					sa->spi == PASSTHROUGHSPI &&
 					isunspecaddr(&sa->dst)) {
-		strcpy(buf, (addrtypeof(&sa->dst) == AF_INET) ?
+		strncpy(buf, (addrtypeof(&sa->dst) == AF_INET) ?
 							PASSTHROUGH4NAME :
-							PASSTHROUGH6NAME);
+							PASSTHROUGH6NAME, sizeof(buf));
 		len = strlen(buf);
 	}
 
@@ -104,13 +104,13 @@ size_t dstlen;
 		default:	p = NULL;	break;
 		}
 		if (p != NULL) {
-			strcpy(buf, p);
+			strncpy(buf, p, sizeof(buf));
 			len = strlen(buf);
 		}
 	}
 
 	if (len == 0) {			/* general case needed */
-		strcpy(buf, pre);
+		strncpy(buf, pre, sizeof(buf));
 		len = strlen(buf);
 		if (showversion) {
 			*(buf+len) = (addrtypeof(&sa->dst) == AF_INET) ? '.' :
@@ -126,7 +126,7 @@ size_t dstlen;
 	if (dst != NULL) {
 		if (len > dstlen)
 			*(buf+dstlen-1) = '\0';
-		strcpy(dst, buf);
+		strncpy(dst, buf, dstlen);
 	}
 	return len;
 }
diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index e1b471b23..2194362d2 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -673,7 +673,7 @@ size_t format_end(char *buf, size_t buf_len, const struct end *this,
 		}
 		else if (subnetisnone(&this->client))
 		{
-			strcpy(client, "?");
+			strncpy(client, "?", sizeof(client));
 		}
 		else
 		{
@@ -685,7 +685,7 @@ size_t format_end(char *buf, size_t buf_len, const struct end *this,
 		/* we are mode config client, or a server with a pool */
 		client_sep = "===";
 		client[0] = '%';
-		strcpy(client+1, this->pool ? this->pool : "modecfg");
+		strncpy(client+1, this->pool ?: "modecfg", sizeof(client)-1);
 	}
 
 	/* host */