diff options
| author | Hans Dedecker <hans.dedecker@technicolor.com> | 2014-01-16 11:33:34 +0100 |
|---|---|---|
| committer | Hans Dedecker <hans.dedecker@technicolor.com> | 2014-01-16 11:33:34 +0100 |
| commit | fa3073b32452d78037d2a8ce2e3ea213b3d5f50c (patch) | |
| tree | 7401745ff5f3eb80c72898e586ab49bb74f71069 | |
| parent | 84cfd09747332071c83de4882daecb9bfb80897b (diff) | |
| parent | d59daa0f4027ee70a4650ab8baa40d58d113cd30 (diff) | |
Merge remote branch 'upstream/master' into bugfixes
| -rw-r--r-- | src/dhcpv6-ia.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 37b7cc8..2e93bd0 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -243,7 +243,14 @@ void dhcpv6_write_statefile(void) inet_ntop(AF_INET6, &addr, ipbuf, sizeof(ipbuf) - 1); if (c->length == 128 && c->hostname && i == 0) { - fprintf(fp, "%s\t%s\n", ipbuf, c->hostname); + fputs(ipbuf, fp); + + char b[256]; + if (dn_expand(iface->search, iface->search + iface->search_len, + iface->search, b, sizeof(b)) > 0) + fprintf(fp, "\t%s.%s", c->hostname, b); + + fprintf(fp, "\t%s\n", c->hostname); md5_hash(ipbuf, strlen(ipbuf), &md5); md5_hash(c->hostname, strlen(c->hostname), &md5); } @@ -275,7 +282,14 @@ void dhcpv6_write_statefile(void) inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1); if (c->hostname[0]) { - fprintf(fp, "%s\t%s\n", ipbuf, c->hostname); + fputs(ipbuf, fp); + + char b[256]; + if (dn_expand(iface->search, iface->search + iface->search_len, + iface->search, b, sizeof(b)) > 0) + fprintf(fp, "\t%s.%s", c->hostname, b); + + fprintf(fp, "\t%s\n", c->hostname); md5_hash(ipbuf, strlen(ipbuf), &md5); md5_hash(c->hostname, strlen(c->hostname), &md5); } |