From: Shawn Routhier <sar@isc.org>
Date: Wed, 1 Jun 2011 23:30:53 +0000 (+0000)
Subject: Enlarge the buffer size used by the Omshell code and some of the
X-Git-Tag: v4_2_2b1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ce29921eedee661f22129176194c13f8d057c1b;p=thirdparty%2Fdhcp.git

Enlarge the buffer size used by the Omshell code and some of the
print routines to allow for greater than 60 characters or, when
printing as hex strings, 20 characters.  [ISC-Bugs #22743]
---

diff --git a/RELNOTES b/RELNOTES
index 12b5a1535..f24932974 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -151,6 +151,10 @@ work on other platforms. Please report any problems and suggested fixes to
   run from the same platform as the server, would appear to fail to
   connect.  This is a companion to #21839.  [ISC-Bugs #23592]
 
+- Enlarge the buffer size used by the Omshell code and some of the
+  print routines to allow for greater than 60 characters or, when
+  printing as hex strings, 20 characters.  [ISC-Bugs #22743]
+
 			Changes since 4.2.1rc1
 
 - None
diff --git a/common/print.c b/common/print.c
index bb59ba3b8..fb2ca0fba 100644
--- a/common/print.c
+++ b/common/print.c
@@ -435,7 +435,7 @@ void print_hex_or_string (len, data, limit, buf)
  * limit - length of buf
  * buf_num - the output buffer to use
  */
-#define HBLEN 60
+#define HBLEN 1024
 char *print_hex(len, data, limit, buf_num)
 	unsigned len;
 	const u_int8_t *data;
diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index ca918ce4e..bb489d845 100644
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -3,7 +3,7 @@
    Examine and modify omapi objects. */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2011 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
@@ -99,7 +99,7 @@ main(int argc, char **argv) {
 	char buf[1024];
 	char s1[1024];
 	int connected = 0;
-	char hex_buf[61];
+	char hex_buf[1025];
 
 	for (i = 1; i < argc; i++) {
 		usage(argv[0]);
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index e642405bc..d94b878e0 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -27,7 +27,7 @@
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
-.\" $Id: dhcpd.conf.5,v 1.106.18.5 2011/05/20 14:21:11 tomasz Exp $
+.\" $Id: dhcpd.conf.5,v 1.106.18.6 2011/06/01 23:30:53 sar Exp $
 .\"
 .TH dhcpd.conf 5
 .SH NAME
@@ -1277,7 +1277,7 @@ chooses a new name.
 The interim DNS update scheme is called interim for two reasons.
 First, it does not quite follow the RFCs.   The RFCs call for a
 new DHCID RRtype while he interim DNS update scheme uses a TXT record.
-The ddns-resolution draft cllaed for the DHCP server to put a DHCID RR
+The ddns-resolution draft called for the DHCP server to put a DHCID RR
 on the PTR record, but the \fIinterim\fR update method does not do this.
 In the final RFC this requirement was relaxed such that a server may
 add a DHCID RR to the PTR record.