From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 13 Sep 2013 08:34:03 +0000 (+0200)
Subject: resolve: Remove comment when using resolvconf(8)
X-Git-Tag: 5.1.1dr4~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5dcb38ead5bf812e19acfa4c3b8867f3123f466;p=thirdparty%2Fstrongswan.git

resolve: Remove comment when using resolvconf(8)

Since comments in resolv.conf are only valid at the beginning of a line
resolvconf(8) seems to have started treating any text after
'nameserver <ip>' as additional IP addresses for name servers.

Since it ignores comments, and we can easily remove the added servers
again, there is no point to add any.

Fixes #410.
---

diff --git a/src/libhydra/plugins/resolve/resolve_handler.c b/src/libhydra/plugins/resolve/resolve_handler.c
index 6c57fa0bf7..2eee854a96 100644
--- a/src/libhydra/plugins/resolve/resolve_handler.c
+++ b/src/libhydra/plugins/resolve/resolve_handler.c
@@ -170,8 +170,7 @@ static bool invoke_resolvconf(private_resolve_handler_t *this,
 			return FALSE;
 		}
 		DBG1(DBG_IKE, "installing DNS server %H via resolvconf", addr);
-		fprintf(out, "nameserver %H   # by strongSwan, from %Y\n", addr,
-				server);
+		fprintf(out, "nameserver %H\n", addr);
 		success = !ferror(out);
 		if (pclose(out))
 		{