- 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.

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;
 }