X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fresolver.c;h=3a11fe71ef860f2f49be96470c46de325e831c02;hb=fc2cca4fa403a4a22caa0f6111c43be40e6094e3;hp=de60cf13cd2a00f2fa08946e465653e9932121a0;hpb=136ce2c05ed1fdd3033215bd9f15867c56b6dc4f;p=connman

diff --git a/src/resolver.c b/src/resolver.c
index de60cf1..3a11fe7 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -149,6 +149,9 @@ int connman_resolver_append(const char *interface, const char *domain,
 
 	DBG("interface %s domain %s server %s", interface, domain, server);
 
+	if (server == NULL)
+		return -EINVAL;
+
 	entry = g_try_new0(struct entry_data, 1);
 	if (entry == NULL)
 		return -ENOMEM;
@@ -250,11 +253,14 @@ static int resolvfile_append(const char *interface, const char *domain,
 	fd = open("/etc/resolv.conf", O_RDWR | O_CREAT,
 					S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 	if (fd < 0)
-		return errno;
+		return -errno;
 
 	err = ftruncate(fd, 0);
 
-	cmd = g_strdup_printf("nameserver %s\n", server);
+	cmd = g_strdup_printf("# Generated by Connection Manager\n"
+						"domain localdomain\n"
+						"search localdomain\n"
+						"nameserver %s\n", server);
 
 	len = write(fd, cmd, strlen(cmd));