diff options
author | David Hankins <dhankins@isc.org> | 2008-04-04 21:36:29 +0000 |
---|---|---|
committer | David Hankins <dhankins@isc.org> | 2008-04-04 21:36:29 +0000 |
commit | f963d108457324e3f3219b2722b5a4adfc2c8011 (patch) | |
tree | 0d2142fe7e95fc3e19392083b17194d70d65566a /common | |
parent | 1f9763f8cd179c82227090cebe9abe3ac2ead6c5 (diff) | |
download | isc-dhcp-f963d108457324e3f3219b2722b5a4adfc2c8011.tar.gz |
- Changes in 4.0.x to common/options.c "pretty_domain()" (which turns
wireformat rfc1035 into printable form for dhclient.leases) were pulled
down. This addresses a bug where "option domain-search , ;" would appear
in dhclient.leases.
Diffstat (limited to 'common')
-rw-r--r-- | common/options.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/options.c b/common/options.c index 6ca20f8a..e7d1f15e 100644 --- a/common/options.c +++ b/common/options.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: options.c,v 1.98.2.14 2008/01/22 19:02:50 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n"; +"$Id: options.c,v 1.98.2.15 2008/04/04 21:36:29 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #define DHCP_OPTION_DATA @@ -3003,7 +3003,7 @@ pretty_domain(char **dst, char *dend, const unsigned char **src, return -1; **dst = '"'; - *dst++; + (*dst)++; do { /* Continue loop until end of src buffer. */ @@ -3012,13 +3012,13 @@ pretty_domain(char **dst, char *dend, const unsigned char **src, /* Consume tag size. */ tsiz = **src; - *src++; + (*src)++; /* At root, finis. */ if (tsiz == 0) break; - tend = *src + tsiz; + tend = (*src) + tsiz; /* If the tag exceeds the source buffer, it's illegal. * This should also trap compression pointers (which should @@ -3034,13 +3034,13 @@ pretty_domain(char **dst, char *dend, const unsigned char **src, return -1; **dst = '.'; - *dst++; + (*dst)++; count += status + 1; } while(1); **dst = '"'; - *dst++; + (*dst)++; return count; } |