Cuddle up to LKML style C

1 files changed, 523 insertions, 574 deletions

diff --git a/configure.c b/configure.c
index 92a2f5c7..c539e9d7 100644
--- a/configure.c
+++ b/configure.c
@@ -50,670 +50,619 @@
 /* IMPORTANT: Ensure that the last parameter is NULL when calling */
 static int exec_cmd (const char *cmd, const char *args, ...)
 {
-  va_list va;
-  pid_t pid;
-  char **argv;
-  int n = 1;
-
-  va_start (va, args);
-  while (va_arg (va, char *) != NULL)
-    n++;
-  va_end (va);
-  argv = alloca ((n + 1) * sizeof (*argv));
-  if (argv == NULL)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-  va_start (va, args);
-  n = 2;
-  argv[0] = (char *) cmd;
-  argv[1] = (char *) args;
-  while ((argv[n] = va_arg (va, char *)) != NULL)
-    n++;
-  va_end (va);
-
-  if ((pid = fork ()) == 0)
-    {
-      if (execv (cmd, argv) && errno != ENOENT)
-        logger (LOG_ERR, "error executing \"%s\": %s",
-                cmd, strerror (errno));
-      exit (0);
-    }
-  else if (pid == -1)
-    logger (LOG_ERR, "fork: %s", strerror (errno));
-
-  return 0;
+	va_list va;
+	pid_t pid;
+	char **argv;
+	int n = 1;
+
+	va_start (va, args);
+	while (va_arg (va, char *) != NULL)
+		n++;
+	va_end (va);
+	argv = alloca ((n + 1) * sizeof (*argv));
+	if (argv == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	va_start (va, args);
+	n = 2;
+	argv[0] = (char *) cmd;
+	argv[1] = (char *) args;
+	while ((argv[n] = va_arg (va, char *)) != NULL)
+		n++;
+	va_end (va);
+
+	if ((pid = fork ()) == 0) {
+		if (execv (cmd, argv) && errno != ENOENT)
+			logger (LOG_ERR, "error executing \"%s\": %s",
+					cmd, strerror (errno));
+		exit (0);
+	} else if (pid == -1)
+		logger (LOG_ERR, "fork: %s", strerror (errno));
+
+	return 0;
 }
 
 static void exec_script (const char *script, const char *infofile,
-                         const char *arg)
+						 const char *arg)
 {
-  struct stat buf;
+	struct stat buf;
 
 #ifdef ENABLE_INFO
-  if (! script || ! infofile || ! arg)
-    return;
+	if (! script || ! infofile || ! arg)
+		return;
 #else
-  if (! script || ! arg)
-    return ;
+	if (! script || ! arg)
+		return ;
 #endif
 
-  if (stat (script, &buf) < 0)
-    {
-      if (strcmp (script, DEFAULT_SCRIPT) != 0)
-        logger (LOG_ERR, "`%s': %s", script, strerror (ENOENT));
-      return;
-    }
+	if (stat (script, &buf) < 0) {
+		if (strcmp (script, DEFAULT_SCRIPT) != 0)
+			logger (LOG_ERR, "`%s': %s", script, strerror (ENOENT));
+		return;
+	}
 
 #ifdef ENABLE_INFO
-  logger (LOG_DEBUG, "exec \"%s %s %s\"", script, infofile, arg);
-  exec_cmd (script, infofile, arg, (char *) NULL);
+	logger (LOG_DEBUG, "exec \"%s %s %s\"", script, infofile, arg);
+	exec_cmd (script, infofile, arg, (char *) NULL);
 #else
-  logger (LOG_DEBUG, "exec \"%s \"\" %s\"", script, infofile, arg);
-  exec_cmd (script, infofile, "", arg, (char *) NULL);
+	logger (LOG_DEBUG, "exec \"%s \"\" %s\"", script, infofile, arg);
+	exec_cmd (script, infofile, "", arg, (char *) NULL);
 #endif
 }
 
 static int make_resolv (const char *ifname, const dhcp_t *dhcp)
 {
-  FILE *f;
-  struct stat buf;
-  char resolvconf[PATH_MAX] = {0};
-  address_t *address;
+	FILE *f;
+	struct stat buf;
+	char resolvconf[PATH_MAX] = {0};
+	address_t *address;
 
 #ifdef RESOLVCONF
-  if (stat (RESOLVCONF, &buf) == 0)
-    {
-      logger (LOG_DEBUG, "sending DNS information to resolvconf");
-      snprintf (resolvconf, PATH_MAX, RESOLVCONF" -a %s", ifname);
-      f = popen (resolvconf, "w");
-
-      if (! f)
-        logger (LOG_ERR, "popen: %s", strerror (errno));
-    }
-  else
+	if (stat (RESOLVCONF, &buf) == 0) {
+		logger (LOG_DEBUG, "sending DNS information to resolvconf");
+		snprintf (resolvconf, PATH_MAX, RESOLVCONF" -a %s", ifname);
+		f = popen (resolvconf, "w");
+
+		if (! f)
+			logger (LOG_ERR, "popen: %s", strerror (errno));
+	} else
 #endif
-    {
-      logger (LOG_DEBUG, "writing "RESOLVFILE);
-      if (! (f = fopen(RESOLVFILE, "w")))
-        logger (LOG_ERR, "fopen `%s': %s", RESOLVFILE, strerror (errno));
-    }
-
-  if (f) 
-    {
-      fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
-      if (dhcp->dnssearch)
-        fprintf (f, "search %s\n", dhcp->dnssearch);
-      else if (dhcp->dnsdomain) {
-        fprintf (f, "search %s\n", dhcp->dnsdomain);
-      }
-
-      for (address = dhcp->dnsservers; address; address = address->next)
-        fprintf (f, "nameserver %s\n", inet_ntoa (address->address));
-
-      if (*resolvconf)
-        pclose (f);
-      else
-        fclose (f);
-    }
-  else
-    return -1;
-
-  /* Refresh the local resolver */
-  res_init ();
-  return 0;
+	{
+		logger (LOG_DEBUG, "writing "RESOLVFILE);
+		if (! (f = fopen(RESOLVFILE, "w")))
+			logger (LOG_ERR, "fopen `%s': %s", RESOLVFILE, strerror (errno));
+	}
+
+	if (f) {
+		fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
+		if (dhcp->dnssearch)
+			fprintf (f, "search %s\n", dhcp->dnssearch);
+		else if (dhcp->dnsdomain) {
+			fprintf (f, "search %s\n", dhcp->dnsdomain);
+		}
+
+		for (address = dhcp->dnsservers; address; address = address->next)
+			fprintf (f, "nameserver %s\n", inet_ntoa (address->address));
+
+		if (*resolvconf)
+			pclose (f);
+		else
+			fclose (f);
+	} else
+		return -1;
+
+	/* Refresh the local resolver */
+	res_init ();
+	return 0;
 }
 
 static void restore_resolv(const char *ifname)
 {
 #ifdef RESOLVCONF
-  struct stat buf;
+	struct stat buf;
 
-  if (stat (RESOLVCONF, &buf) < 0)
-    return;
+	if (stat (RESOLVCONF, &buf) < 0)
+		return;
 
-  logger (LOG_DEBUG, "removing information from resolvconf");
-  exec_cmd (RESOLVCONF, "-d", ifname, (char *) NULL);
+	logger (LOG_DEBUG, "removing information from resolvconf");
+	exec_cmd (RESOLVCONF, "-d", ifname, (char *) NULL);
 #endif
 }
 
 #ifdef ENABLE_NTP
 static int _make_ntp (const char *file, const char *ifname, const dhcp_t *dhcp)
 {
-  FILE *f;
-  address_t *address;
-  char *a;
-  char buffer[1024];
-  int tomatch = 0;
-  char *token;
-  bool ntp = false;
-
-  for (address = dhcp->ntpservers; address; address = address->next)
-    tomatch++;
-
-  /* Check that we really need to update the servers
-     We do this because ntp has to be restarted to work with a changed config */
-  if (! (f = fopen (file, "r")))
-    {
-      if (errno != ENOENT)
-        {
-          logger (LOG_ERR, "fopen `%s': %s", file, strerror (errno));
-          return -1;
-        }
-    }
-  else
-    {
-      memset (buffer, 0, sizeof (buffer));
-      while (fgets (buffer, sizeof (buffer), f))
-        {
-          a = buffer;
-          token = strsep (&a, " ");
-          if (! token || strcmp (token, "server") != 0)
-            continue;
-
-          if ((token = strsep (&a, " \n")) == NULL)
-            continue;
-
-          for (address = dhcp->ntpservers; address; address = address->next)
-            if (strcmp (token, inet_ntoa (address->address)) == 0)
-              {
-                tomatch--;
-                break;
-              }
-
-          if (tomatch == 0)
-            break;
-        }
-      fclose (f);
-
-      /* File has the same name servers that we do, so no need to restart ntp */
-      if (tomatch == 0)
-        {
-          logger (LOG_DEBUG, "%s already configured, skipping", file);
-          return 0;
-        }
-    }
-
-  logger (LOG_DEBUG, "writing %s", file);
-  if (! (f = fopen (file, "w")))
-    {
-      logger (LOG_ERR, "fopen `%s': %s", file, strerror (errno));
-      return -1;
-    }
-
-  fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
+	FILE *f;
+	address_t *address;
+	char *a;
+	char buffer[1024];
+	int tomatch = 0;
+	char *token;
+	bool ntp = false;
+
+	for (address = dhcp->ntpservers; address; address = address->next)
+		tomatch++;
+
+	/* Check that we really need to update the servers
+	   We do this because ntp has to be restarted to work with a changed config */
+	if (! (f = fopen (file, "r"))) {
+		if (errno != ENOENT) {
+			logger (LOG_ERR, "fopen `%s': %s", file, strerror (errno));
+			return -1;
+		}
+	} else {
+		memset (buffer, 0, sizeof (buffer));
+		while (fgets (buffer, sizeof (buffer), f)) {
+			a = buffer;
+			token = strsep (&a, " ");
+			if (! token || strcmp (token, "server") != 0)
+				continue;
+
+			if ((token = strsep (&a, " \n")) == NULL)
+				continue;
+
+			for (address = dhcp->ntpservers; address; address = address->next)
+				if (strcmp (token, inet_ntoa (address->address)) == 0) {
+					tomatch--;
+					break;
+				}
+
+			if (tomatch == 0)
+				break;
+		}
+		fclose (f);
+
+		/* File has the same name servers that we do, so no need to restart ntp */
+		if (tomatch == 0) {
+			logger (LOG_DEBUG, "%s already configured, skipping", file);
+			return 0;
+		}
+	}
+
+	logger (LOG_DEBUG, "writing %s", file);
+	if (! (f = fopen (file, "w"))) {
+		logger (LOG_ERR, "fopen `%s': %s", file, strerror (errno));
+		return -1;
+	}
+
+	fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
 #ifdef NTPFILE
-  if (strcmp (file, NTPFILE) == 0)
-    {
-      ntp = true;
-      fprintf (f, "restrict default noquery notrust nomodify\n");
-      fprintf (f, "restrict 127.0.0.1\n");
-    }
+	if (strcmp (file, NTPFILE) == 0) {
+		ntp = true;
+		fprintf (f, "restrict default noquery notrust nomodify\n");
+		fprintf (f, "restrict 127.0.0.1\n");
+	}
 #endif
 
-  for (address = dhcp->ntpservers; address; address = address->next)
-    {
-      a = inet_ntoa (address->address);
-      if (ntp)
-        fprintf (f, "restrict %s nomodify notrap noquery\n", a);
-      fprintf (f, "server %s\n", a);
-    }
-
-  if (ntp)
-    {
-      fprintf (f, "driftfile " NTPDRIFTFILE "\n");
-      fprintf (f, "logfile " NTPLOGFILE "\n");
-    }
-  fclose (f);
-
-  return 1;
+	for (address = dhcp->ntpservers; address; address = address->next) {
+		a = inet_ntoa (address->address);
+		if (ntp)
+			fprintf (f, "restrict %s nomodify notrap noquery\n", a);
+		fprintf (f, "server %s\n", a);
+	}
+
+	if (ntp) {
+		fprintf (f, "driftfile " NTPDRIFTFILE "\n");
+		fprintf (f, "logfile " NTPLOGFILE "\n");
+	}
+	fclose (f);
+
+	return 1;
 }
 
 static int make_ntp (const char *ifname, const dhcp_t *dhcp)
 {
-  /* On some systems we have only have one ntp service, but we don't know
-     which configuration file we're using. So we need to write to both and
-     restart accordingly. */
+	/* On some systems we have only have one ntp service, but we don't know
+	   which configuration file we're using. So we need to write to both and
+	   restart accordingly. */
 
-  bool restart_ntp = false;
-  bool restart_openntp = false;
-  int retval = 0;
+	bool restart_ntp = false;
+	bool restart_openntp = false;
+	int retval = 0;
 
 #ifdef NTPFILE
-  if (_make_ntp (NTPFILE, ifname, dhcp) > 0)
-    restart_ntp = true;
+	if (_make_ntp (NTPFILE, ifname, dhcp) > 0)
+		restart_ntp = true;
 #endif
 
 #ifdef OPENNTPFILE
-  if (_make_ntp (OPENNTPFILE, ifname, dhcp) > 0)
-    restart_openntp = true;
+	if (_make_ntp (OPENNTPFILE, ifname, dhcp) > 0)
+		restart_openntp = true;
 #endif
 
 #ifdef NTPSERVICE
-  if (restart_ntp)
-    retval += exec_cmd (NTPSERVICE, NTPRESTARTARGS, (char *) NULL);
+	if (restart_ntp)
+		retval += exec_cmd (NTPSERVICE, NTPRESTARTARGS, (char *) NULL);
 #endif
 
 #if defined (NTPSERVICE) && defined (OPENNTPSERVICE)
-  if (restart_openntp &&
-      (strcmp (NTPSERVICE, OPENNTPSERVICE) != 0 || ! restart_ntp))
-    retval += exec_cmd (OPENNTPSERVICE, OPENNTPRESTARTARGS, (char *) NULL);
+	if (restart_openntp &&
+		(strcmp (NTPSERVICE, OPENNTPSERVICE) != 0 || ! restart_ntp))
+		retval += exec_cmd (OPENNTPSERVICE, OPENNTPRESTARTARGS, (char *) NULL);
 #elif defined (OPENNTPSERVICE) && ! defined (NTPSERVICE)
-  if (restart_openntp) 
-    retval += exec_cmd (OPENNTPSERVICE, OPENNTPRESTARTARGS, (char *) NULL);
+	if (restart_openntp) 
+		retval += exec_cmd (OPENNTPSERVICE, OPENNTPRESTARTARGS, (char *) NULL);
 #endif
 
-  return retval;
+	return retval;
 }
 #endif
 
 #ifdef ENABLE_NIS
 static int make_nis (const char *ifname, const dhcp_t *dhcp)
 {
-  FILE *f;
-  address_t *address;
-  char prefix[256] = {0};
-
-  logger (LOG_DEBUG, "writing "NISFILE);
-  if (! (f = fopen(NISFILE, "w")))
-    {
-      logger (LOG_ERR, "fopen `%s': %s", NISFILE, strerror (errno));
-      return -1;
-    }
-
-  fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
-  if (dhcp->nisdomain)
-    {
-      setdomainname (dhcp->nisdomain, strlen (dhcp->nisdomain));
-
-      if (dhcp->nisservers)
-        snprintf (prefix, sizeof (prefix), "domain %s server", dhcp->nisdomain);
-      else
-        fprintf (f, "domain %s broadcast\n", dhcp->nisdomain);
-    }
-  else
-    snprintf (prefix, sizeof (prefix), "%s", "ypserver");
-
-  for (address = dhcp->nisservers; address; address = address->next)
-    fprintf (f, "%s %s\n", prefix, inet_ntoa (address->address));
-
-  fclose (f);
-
-  exec_cmd (NISSERVICE, NISRESTARTARGS, (char *) NULL);
-  return 0;
+	FILE *f;
+	address_t *address;
+	char prefix[256] = {0};
+
+	logger (LOG_DEBUG, "writing "NISFILE);
+	if (! (f = fopen(NISFILE, "w"))) {
+		logger (LOG_ERR, "fopen `%s': %s", NISFILE, strerror (errno));
+		return -1;
+	}
+
+	fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname);
+	if (dhcp->nisdomain) {
+		setdomainname (dhcp->nisdomain, strlen (dhcp->nisdomain));
+
+		if (dhcp->nisservers)
+			snprintf (prefix, sizeof (prefix), "domain %s server", dhcp->nisdomain);
+		else
+			fprintf (f, "domain %s broadcast\n", dhcp->nisdomain);
+	}
+	else
+		snprintf (prefix, sizeof (prefix), "%s", "ypserver");
+
+	for (address = dhcp->nisservers; address; address = address->next)
+		fprintf (f, "%s %s\n", prefix, inet_ntoa (address->address));
+
+	fclose (f);
+
+	exec_cmd (NISSERVICE, NISRESTARTARGS, (char *) NULL);
+	return 0;
 }
 #endif
 
 #ifdef ENABLE_INFO
 static char *cleanmetas (const char *cstr)
 {
-  /* The largest single element we can have is 256 bytes according to the RFC,
-     so this buffer size should be safe even if it's all ' */
-  static char buffer[1024]; 
-  char *b = buffer;
-
-  memset (buffer, 0, sizeof (buffer));
-  if (cstr == NULL || strlen (cstr) == 0)
-    return b;
-
-  do
-    if (*cstr == 39)
-      {
-        *b++ = '\'';
-        *b++ = '\\';
-        *b++ = '\'';
-        *b++ = '\'';
-      }
-    else
-      *b++ = *cstr;
-  while (*cstr++);
-
-  *b++ = 0;
-  b = buffer;
-
-  return b;
+	/* The largest single element we can have is 256 bytes according to the RFC,
+	   so this buffer size should be safe even if it's all ' */
+	static char buffer[1024]; 
+	char *b = buffer;
+
+	memset (buffer, 0, sizeof (buffer));
+	if (cstr == NULL || strlen (cstr) == 0)
+		return b;
+
+	do
+		if (*cstr == 39) {
+			*b++ = '\'';
+			*b++ = '\\';
+			*b++ = '\'';
+			*b++ = '\'';
+		} else
+			*b++ = *cstr;
+	while (*cstr++);
+
+	*b++ = 0;
+	b = buffer;
+
+	return b;
 }
 
 static int write_info(const interface_t *iface, const dhcp_t *dhcp,
-                      const options_t *options)
+					  const options_t *options)
 {
-  FILE *f;
-  route_t *route;
-  address_t *address;
-
-  logger (LOG_DEBUG, "writing %s", iface->infofile);
-  if ((f = fopen (iface->infofile, "w")) == NULL)
-    {
-      logger (LOG_ERR, "fopen `%s': %s", iface->infofile, strerror (errno));
-      return -1;
-    }
-
-  fprintf (f, "IPADDR='%s'\n", inet_ntoa (dhcp->address));
-  fprintf (f, "NETMASK='%s'\n", inet_ntoa (dhcp->netmask));
-  fprintf (f, "BROADCAST='%s'\n", inet_ntoa (dhcp->broadcast));
-  if (dhcp->mtu > 0)
-    fprintf (f, "MTU='%d'\n", dhcp->mtu);
-
-  if (dhcp->routes)
-    {
-      fprintf (f, "ROUTES='");
-      for (route = dhcp->routes; route; route = route->next)
-        {
-          fprintf (f, "%s", inet_ntoa (route->destination));
-          fprintf (f, ",%s", inet_ntoa (route->netmask));
-          fprintf (f, ",%s", inet_ntoa (route->gateway));
-          if (route->next)
-            fprintf (f, " ");
-        }
-      fprintf (f, "'\n");
-    }
-
-  if (dhcp->hostname)
-    fprintf (f, "HOSTNAME='%s'\n", cleanmetas (dhcp->hostname));
-
-  if (dhcp->dnsdomain)
-    fprintf (f, "DNSDOMAIN='%s'\n", cleanmetas (dhcp->dnsdomain));
-
-  if (dhcp->dnssearch)
-    fprintf (f, "DNSSEARCH='%s'\n", cleanmetas (dhcp->dnssearch));
-
-  if (dhcp->dnsservers)
-    {
-      fprintf (f, "DNSSERVERS='");
-      for (address = dhcp->dnsservers; address; address = address->next)
-        {
-          fprintf (f, "%s", inet_ntoa (address->address));
-          if (address->next)
-            fprintf (f, " ");
-        }
-      fprintf (f, "'\n");
-    }
-
-  if (dhcp->fqdn)
-    {
-      fprintf (f, "FQDNFLAGS='%u'\n", dhcp->fqdn->flags);
-      fprintf (f, "FQDNRCODE1='%u'\n", dhcp->fqdn->r1);
-      fprintf (f, "FQDNRCODE2='%u'\n", dhcp->fqdn->r2);
-      fprintf (f, "FQDNHOSTNAME='%s'\n", dhcp->fqdn->name);
-    }
-
-  if (dhcp->ntpservers)
-    {
-      fprintf (f, "NTPSERVERS='");
-      for (address = dhcp->ntpservers; address; address = address->next)
-        {
-          fprintf (f, "%s", inet_ntoa (address->address));
-          if (address->next)
-            fprintf (f, " ");
-        }
-      fprintf (f, "'\n");
-    }
-
-  if (dhcp->nisdomain)
-    fprintf (f, "NISDOMAIN='%s'\n", cleanmetas (dhcp->nisdomain));
-
-  if (dhcp->nisservers)
-    {
-      fprintf (f, "NISSERVERS='");
-      for (address = dhcp->nisservers; address; address = address->next)
-        {
-          fprintf (f, "%s", inet_ntoa (address->address));
-          if (address->next)
-            fprintf (f, " ");
-        }
-      fprintf (f, "'\n");
-    }
-
-  if (dhcp->rootpath)
-    fprintf (f, "ROOTPATH='%s'\n", cleanmetas (dhcp->rootpath));
-
-  fprintf (f, "DHCPSID='%s'\n", inet_ntoa (dhcp->serveraddress));
-  fprintf (f, "DHCPSNAME='%s'\n", cleanmetas (dhcp->servername));
-  fprintf (f, "LEASETIME='%u'\n", dhcp->leasetime);
-  fprintf (f, "RENEWALTIME='%u'\n", dhcp->renewaltime);
-  fprintf (f, "REBINDTIME='%u'\n", dhcp->rebindtime);
-  fprintf (f, "INTERFACE='%s'\n", iface->name);
-  fprintf (f, "CLASSID='%s'\n", cleanmetas (options->classid));
-  if (options->clientid[0])
-    fprintf (f, "CLIENTID='%s'\n", cleanmetas (options->clientid));
-  else
-    fprintf (f, "CLIENTID='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
-  fprintf (f, "DHCPCHADDR='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
-  fclose (f);
-  return 0;
+	FILE *f;
+	route_t *route;
+	address_t *address;
+
+	logger (LOG_DEBUG, "writing %s", iface->infofile);
+	if ((f = fopen (iface->infofile, "w")) == NULL) {
+		logger (LOG_ERR, "fopen `%s': %s", iface->infofile, strerror (errno));
+		return -1;
+	}
+
+	fprintf (f, "IPADDR='%s'\n", inet_ntoa (dhcp->address));
+	fprintf (f, "NETMASK='%s'\n", inet_ntoa (dhcp->netmask));
+	fprintf (f, "BROADCAST='%s'\n", inet_ntoa (dhcp->broadcast));
+	if (dhcp->mtu > 0)
+		fprintf (f, "MTU='%d'\n", dhcp->mtu);
+
+	if (dhcp->routes) {
+		fprintf (f, "ROUTES='");
+		for (route = dhcp->routes; route; route = route->next) {
+			fprintf (f, "%s", inet_ntoa (route->destination));
+			fprintf (f, ",%s", inet_ntoa (route->netmask));
+			fprintf (f, ",%s", inet_ntoa (route->gateway));
+			if (route->next)
+				fprintf (f, " ");
+		}
+		fprintf (f, "'\n");
+	}
+
+	if (dhcp->hostname)
+		fprintf (f, "HOSTNAME='%s'\n", cleanmetas (dhcp->hostname));
+
+	if (dhcp->dnsdomain)
+		fprintf (f, "DNSDOMAIN='%s'\n", cleanmetas (dhcp->dnsdomain));
+
+	if (dhcp->dnssearch)
+		fprintf (f, "DNSSEARCH='%s'\n", cleanmetas (dhcp->dnssearch));
+
+	if (dhcp->dnsservers) {
+		fprintf (f, "DNSSERVERS='");
+		for (address = dhcp->dnsservers; address; address = address->next) {
+			fprintf (f, "%s", inet_ntoa (address->address));
+			if (address->next)
+				fprintf (f, " ");
+		}
+		fprintf (f, "'\n");
+	}
+
+	if (dhcp->fqdn) {
+		fprintf (f, "FQDNFLAGS='%u'\n", dhcp->fqdn->flags);
+		fprintf (f, "FQDNRCODE1='%u'\n", dhcp->fqdn->r1);
+		fprintf (f, "FQDNRCODE2='%u'\n", dhcp->fqdn->r2);
+		fprintf (f, "FQDNHOSTNAME='%s'\n", dhcp->fqdn->name);
+	}
+
+	if (dhcp->ntpservers) {
+		fprintf (f, "NTPSERVERS='");
+		for (address = dhcp->ntpservers; address; address = address->next) {
+			fprintf (f, "%s", inet_ntoa (address->address));
+			if (address->next)
+				fprintf (f, " ");
+		}
+		fprintf (f, "'\n");
+	}
+
+	if (dhcp->nisdomain)
+		fprintf (f, "NISDOMAIN='%s'\n", cleanmetas (dhcp->nisdomain));
+
+	if (dhcp->nisservers) {
+		fprintf (f, "NISSERVERS='");
+		for (address = dhcp->nisservers; address; address = address->next) {
+			fprintf (f, "%s", inet_ntoa (address->address));
+			if (address->next)
+				fprintf (f, " ");
+		}
+		fprintf (f, "'\n");
+	}
+
+	if (dhcp->rootpath)
+		fprintf (f, "ROOTPATH='%s'\n", cleanmetas (dhcp->rootpath));
+
+	fprintf (f, "DHCPSID='%s'\n", inet_ntoa (dhcp->serveraddress));
+	fprintf (f, "DHCPSNAME='%s'\n", cleanmetas (dhcp->servername));
+	fprintf (f, "LEASETIME='%u'\n", dhcp->leasetime);
+	fprintf (f, "RENEWALTIME='%u'\n", dhcp->renewaltime);
+	fprintf (f, "REBINDTIME='%u'\n", dhcp->rebindtime);
+	fprintf (f, "INTERFACE='%s'\n", iface->name);
+	fprintf (f, "CLASSID='%s'\n", cleanmetas (options->classid));
+	if (options->clientid[0])
+		fprintf (f, "CLIENTID='%s'\n", cleanmetas (options->clientid));
+	else
+		fprintf (f, "CLIENTID='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
+	fprintf (f, "DHCPCHADDR='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
+	fclose (f);
+	return 0;
 }
 #endif
 
 int configure (const options_t *options, interface_t *iface,
-               const dhcp_t *dhcp)
+			   const dhcp_t *dhcp)
 {
-  route_t *route = NULL;
-  route_t *new_route = NULL;
-  route_t *old_route = NULL;
-  struct hostent *he = NULL;
-  char newhostname[HOSTNAME_MAX_LEN] = {0};
-  char curhostname[HOSTNAME_MAX_LEN] = {0};
-  char *dname = NULL;
-  int dnamel = 0;
-
-  if (! options || ! iface || ! dhcp)
-    return -1;
-
-  /* Remove old routes
-     Always do this as the interface may have >1 address not added by us
-     so the routes we added may still exist */
-  if (iface->previous_routes)
-    {
-      for (route = iface->previous_routes; route; route = route->next)
-        if (route->destination.s_addr || options->dogateway)
-          {
-            int have = 0;
-            if (dhcp->address.s_addr != 0)
-              for (new_route = dhcp->routes; new_route; new_route = new_route->next)
-                if (new_route->destination.s_addr == route->destination.s_addr
-                    && new_route->netmask.s_addr == route->netmask.s_addr
-                    && new_route->gateway.s_addr == route->gateway.s_addr)
-                  {
-                    have = 1;
-                    break;
-                  }
-            if (! have)
-              del_route (iface->name, route->destination, route->netmask,
-                         route->gateway, options->metric);
-          }
-    }
-
-  /* If we don't have an address, then return */
-  if (dhcp->address.s_addr == 0)
-    {
-      if (iface->previous_routes)
-        {
-          free_route (iface->previous_routes);
-          iface->previous_routes = NULL;
-        }
-
-      /* Restore the original MTU value */
-      if (iface->mtu && iface->previous_mtu != iface->mtu)
-        {
-          set_mtu (iface->name, iface->mtu);
-          iface->previous_mtu = iface->mtu;
-        }
-
-      /* Only reset things if we had set them before */
-      if (iface->previous_address.s_addr != 0)
-        {
-          del_address (iface->name, iface->previous_address,
-                       iface->previous_netmask);
-          memset (&iface->previous_address, 0, sizeof (struct in_addr));
-          memset (&iface->previous_netmask, 0, sizeof (struct in_addr));
-
-          restore_resolv (iface->name);
-
-          /* we currently don't have a resolvconf style programs for ntp/nis */
-          exec_script (options->script, iface->infofile, "down");
-        }
-      return 0;
-    }
-
-  /* Set the MTU requested.
-     If the DHCP server no longer sends one OR it's invalid then we restore
-     the original MTU */
-  if (options->domtu)
-    {
-      unsigned short mtu = iface->mtu;
-      if (dhcp->mtu)
-        mtu = dhcp->mtu;
-
-      if (mtu != iface->previous_mtu)
-        {
-          if (set_mtu (iface->name, mtu) == 0)
-            iface->previous_mtu = mtu;
-        }
-    }
-
-  if (add_address (iface->name, dhcp->address, dhcp->netmask,
-                   dhcp->broadcast) < 0 && errno != EEXIST)
-    return -1;
-
-  /* Now delete the old address if different */
-  if (iface->previous_address.s_addr != dhcp->address.s_addr
-      && iface->previous_address.s_addr != 0)
-    del_address (iface->name, iface->previous_address, iface->previous_netmask);
+	route_t *route = NULL;
+	route_t *new_route = NULL;
+	route_t *old_route = NULL;
+	struct hostent *he = NULL;
+	char newhostname[HOSTNAME_MAX_LEN] = {0};
+	char curhostname[HOSTNAME_MAX_LEN] = {0};
+	char *dname = NULL;
+	int dnamel = 0;
+
+	if (! options || ! iface || ! dhcp)
+		return -1;
+
+	/* Remove old routes
+	   Always do this as the interface may have >1 address not added by us
+	   so the routes we added may still exist */
+	if (iface->previous_routes) {
+		for (route = iface->previous_routes; route; route = route->next)
+			if (route->destination.s_addr || options->dogateway) {
+				int have = 0;
+				if (dhcp->address.s_addr != 0)
+					for (new_route = dhcp->routes; new_route; new_route = new_route->next)
+						if (new_route->destination.s_addr == route->destination.s_addr
+							&& new_route->netmask.s_addr == route->netmask.s_addr
+							&& new_route->gateway.s_addr == route->gateway.s_addr)
+						{
+							have = 1;
+							break;
+						}
+				if (! have)
+					del_route (iface->name, route->destination, route->netmask,
+							   route->gateway, options->metric);
+			}
+	}
+
+	/* If we don't have an address, then return */
+	if (dhcp->address.s_addr == 0) {
+		if (iface->previous_routes) {
+			free_route (iface->previous_routes);
+			iface->previous_routes = NULL;
+		}
+
+		/* Restore the original MTU value */
+		if (iface->mtu && iface->previous_mtu != iface->mtu) {
+			set_mtu (iface->name, iface->mtu);
+			iface->previous_mtu = iface->mtu;
+		}
+
+		/* Only reset things if we had set them before */
+		if (iface->previous_address.s_addr != 0) {
+			del_address (iface->name, iface->previous_address,
+						 iface->previous_netmask);
+			memset (&iface->previous_address, 0, sizeof (struct in_addr));
+			memset (&iface->previous_netmask, 0, sizeof (struct in_addr));
+
+			restore_resolv (iface->name);
+
+			/* we currently don't have a resolvconf style programs for ntp/nis */
+			exec_script (options->script, iface->infofile, "down");
+		}
+		return 0;
+	}
+
+	/* Set the MTU requested.
+	   If the DHCP server no longer sends one OR it's invalid then we restore
+	   the original MTU */
+	if (options->domtu) {
+		unsigned short mtu = iface->mtu;
+		if (dhcp->mtu)
+			mtu = dhcp->mtu;
+
+		if (mtu != iface->previous_mtu) {
+			if (set_mtu (iface->name, mtu) == 0)
+				iface->previous_mtu = mtu;
+		}
+	}
+
+	if (add_address (iface->name, dhcp->address, dhcp->netmask,
+					 dhcp->broadcast) < 0 && errno != EEXIST)
+		return -1;
+
+	/* Now delete the old address if different */
+	if (iface->previous_address.s_addr != dhcp->address.s_addr
+		&& iface->previous_address.s_addr != 0)
+		del_address (iface->name, iface->previous_address, iface->previous_netmask);
 
 #ifdef __linux__
-  /* On linux, we need to change the subnet route to have our metric. */
-  if (iface->previous_address.s_addr != dhcp->address.s_addr
-      && options->metric > 0 && dhcp->netmask.s_addr != INADDR_BROADCAST)
-    {
-      struct in_addr td;
-      struct in_addr tg;
-      memset (&td, 0, sizeof (td));
-      memset (&tg, 0, sizeof (tg));
-      td.s_addr = dhcp->address.s_addr & dhcp->netmask.s_addr;
-      add_route (iface->name, td, dhcp->netmask, tg, options->metric);
-      del_route (iface->name, td, dhcp->netmask, tg, 0);
-    }
+	/* On linux, we need to change the subnet route to have our metric. */
+	if (iface->previous_address.s_addr != dhcp->address.s_addr
+		&& options->metric > 0 && dhcp->netmask.s_addr != INADDR_BROADCAST)
+	{
+		struct in_addr td;
+		struct in_addr tg;
+		memset (&td, 0, sizeof (td));
+		memset (&tg, 0, sizeof (tg));
+		td.s_addr = dhcp->address.s_addr & dhcp->netmask.s_addr;
+		add_route (iface->name, td, dhcp->netmask, tg, options->metric);
+		del_route (iface->name, td, dhcp->netmask, tg, 0);
+	}
 #endif
 
-  /* Remember added routes */
-  if (dhcp->routes)
-    {
-      route_t *new_routes = NULL;
-      int remember;
-
-      for (route = dhcp->routes; route; route = route->next)
-        {
-          /* Don't set default routes if not asked to */
-          if (route->destination.s_addr == 0 && route->netmask.s_addr == 0
-              && ! options->dogateway)
-            continue;
-
-          remember = add_route (iface->name, route->destination,
-                                route->netmask,  route->gateway,
-                                options->metric);
-          /* If we failed to add the route, we may have already added it
-             ourselves. If so, remember it again. */
-          if (remember < 0)
-            for (old_route = iface->previous_routes; old_route;
-                 old_route = old_route->next)
-              if (old_route->destination.s_addr == route->destination.s_addr
-                  && old_route->netmask.s_addr == route->netmask.s_addr
-                  && old_route->gateway.s_addr == route->gateway.s_addr)
-                {
-                  remember = 1;
-                  break;
-                }
-
-          if (remember >= 0)
-            {
-              if (! new_routes)
-                {
-                  new_routes = xmalloc (sizeof (route_t));
-                  memset (new_routes, 0, sizeof (route_t));
-                  new_route = new_routes;
-                }
-              else
-                {
-                  new_route->next = xmalloc (sizeof (route_t));
-                  new_route = new_route->next;
-                }
-              memcpy (new_route, route, sizeof (route_t));
-              new_route -> next = NULL;
-            }
-        }
-
-      if (iface->previous_routes)
-        free_route (iface->previous_routes);
-
-      iface->previous_routes = new_routes;
-    }
-
-  if (options->dodns && dhcp->dnsservers)
-    make_resolv(iface->name, dhcp);
-  else
-    logger (LOG_DEBUG, "no dns information to write");
+	/* Remember added routes */
+	if (dhcp->routes) {
+		route_t *new_routes = NULL;
+		int remember;
+
+		for (route = dhcp->routes; route; route = route->next) {
+			/* Don't set default routes if not asked to */
+			if (route->destination.s_addr == 0 && route->netmask.s_addr == 0
+				&& ! options->dogateway)
+				continue;
+
+			remember = add_route (iface->name, route->destination,
+								  route->netmask,  route->gateway,
+								  options->metric);
+			/* If we failed to add the route, we may have already added it
+			   ourselves. If so, remember it again. */
+			if (remember < 0)
+				for (old_route = iface->previous_routes; old_route;
+					 old_route = old_route->next)
+					if (old_route->destination.s_addr == route->destination.s_addr
+						&& old_route->netmask.s_addr == route->netmask.s_addr
+						&& old_route->gateway.s_addr == route->gateway.s_addr)
+					{
+						remember = 1;
+						break;
+					}
+
+			if (remember >= 0) {
+				if (! new_routes) {
+					new_routes = xmalloc (sizeof (route_t));
+					memset (new_routes, 0, sizeof (route_t));
+					new_route = new_routes;
+				} else {
+					new_route->next = xmalloc (sizeof (route_t));
+					new_route = new_route->next;
+				}
+				memcpy (new_route, route, sizeof (route_t));
+				new_route -> next = NULL;
+			}
+		}
+
+		if (iface->previous_routes)
+			free_route (iface->previous_routes);
+
+		iface->previous_routes = new_routes;
+	}
+
+	if (options->dodns && dhcp->dnsservers)
+		make_resolv(iface->name, dhcp);
+	else
+		logger (LOG_DEBUG, "no dns information to write");
 
 #ifdef ENABLE_NTP
-  if (options->dontp && dhcp->ntpservers)
-    make_ntp(iface->name, dhcp);
+	if (options->dontp && dhcp->ntpservers)
+		make_ntp(iface->name, dhcp);
 #endif
 
 #ifdef ENABLE_NIS
-  if (options->donis && (dhcp->nisservers || dhcp->nisdomain))
-    make_nis(iface->name, dhcp);
+	if (options->donis && (dhcp->nisservers || dhcp->nisdomain))
+		make_nis(iface->name, dhcp);
 #endif
 
-  /* Now we have made a resolv.conf we can obtain a hostname if we need one */
-  if (options->dohostname && ! dhcp->hostname)
-    {
-      he = gethostbyaddr (inet_ntoa (dhcp->address),
-                          sizeof (struct in_addr), AF_INET);
-      if (he)
-        {
-          dname = he->h_name;
-          while (*dname > 32)
-            dname++;
-          dnamel = dname - he->h_name;
-          memcpy (newhostname, he->h_name, dnamel);
-          newhostname[dnamel] = 0;
-        }
-    }
-
-  gethostname (curhostname, sizeof (curhostname));
-
-  if (options->dohostname
-      || strlen (curhostname) == 0
-      || strcmp (curhostname, "(none)") == 0
-      || strcmp (curhostname, "localhost") == 0)
-    {
-      if (dhcp->hostname)
-        strlcpy (newhostname, dhcp->hostname, sizeof (newhostname)); 
-
-      if (*newhostname)
-        {
-          logger (LOG_INFO, "setting hostname to `%s'", newhostname);
-          sethostname (newhostname, strlen (newhostname));
-        }
-    }
+	/* Now we have made a resolv.conf we can obtain a hostname if we need one */
+	if (options->dohostname && ! dhcp->hostname) {
+		he = gethostbyaddr (inet_ntoa (dhcp->address),
+							sizeof (struct in_addr), AF_INET);
+		if (he) {
+			dname = he->h_name;
+			while (*dname > 32)
+				dname++;
+			dnamel = dname - he->h_name;
+			memcpy (newhostname, he->h_name, dnamel);
+			newhostname[dnamel] = 0;
+		}
+	}
+
+	gethostname (curhostname, sizeof (curhostname));
+
+	if (options->dohostname
+		|| strlen (curhostname) == 0
+		|| strcmp (curhostname, "(none)") == 0
+		|| strcmp (curhostname, "localhost") == 0)
+	{
+		if (dhcp->hostname)
+			strlcpy (newhostname, dhcp->hostname, sizeof (newhostname)); 
+
+		if (*newhostname) {
+			logger (LOG_INFO, "setting hostname to `%s'", newhostname);
+			sethostname (newhostname, strlen (newhostname));
+		}
+	}
 
 #ifdef ENABLE_INFO
-  write_info (iface, dhcp, options);
+	write_info (iface, dhcp, options);
 #endif
 
-  if (iface->previous_address.s_addr != dhcp->address.s_addr ||
-      iface->previous_netmask.s_addr != dhcp->netmask.s_addr)
-    {
-      memcpy (&iface->previous_address,
-              &dhcp->address, sizeof (struct in_addr));
-      memcpy (&iface->previous_netmask,
-              &dhcp->netmask, sizeof (struct in_addr));
-      exec_script (options->script, iface->infofile, "new");
-    }
-  else
-    exec_script (options->script, iface->infofile, "up");
-
-  return 0;
+	if (iface->previous_address.s_addr != dhcp->address.s_addr ||
+		iface->previous_netmask.s_addr != dhcp->netmask.s_addr)
+	{
+		memcpy (&iface->previous_address,
+				&dhcp->address, sizeof (struct in_addr));
+		memcpy (&iface->previous_netmask,
+				&dhcp->netmask, sizeof (struct in_addr));
+		exec_script (options->script, iface->infofile, "new");
+	} else
+		exec_script (options->script, iface->infofile, "up");
+
+	return 0;
 }