- "The LDAP Patch" that has been circulating for some time, written by

  Brian Masney and S.Kalyanasundraram and maintained for application to
  the DHCP-4 sources by David Cantrell has been included.  Please be
  advised that these sources were contributed, and do not yet meet the
  high standards we place on production sources we include by default.
  As a result, the LDAP features are only included by using a compile-time
  option which defaults off, and if you enable it you do so under your
  own recognizance.  We will be improving this software over time.
  [ISC-Bugs #17741]

2 files changed, 13 insertions, 5 deletions

diff --git a/common/conflex.c b/common/conflex.c
index 81690c4f..37811657 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -177,9 +177,16 @@ static int get_char (cfile)
 	/* My kingdom for WITH... */
 	int c;
 
-	if (cfile->bufix == cfile->buflen)
+	if (cfile->bufix == cfile->buflen) {
+#if !defined(LDAP_CONFIGURATION)
 		c = EOF;
-	else {
+#else /* defined(LDAP_CONFIGURATION) */
+		if (cfile->read_function != NULL)
+			c = cfile->read_function(cfile);
+		else
+			c = EOF;
+#endif
+	} else {
 		c = cfile->inbuf [cfile->bufix];
 		cfile->bufix++;
 	}
@@ -1502,3 +1509,4 @@ intern(char *atom, enum dhcp_token dfv) {
 	}
 	return dfv;
 }
+
diff --git a/common/print.c b/common/print.c
index 5ca093a7..2f30c96e 100644
--- a/common/print.c
+++ b/common/print.c
@@ -164,9 +164,9 @@ char *print_base64 (const unsigned char *buf, unsigned len,
 }
 
 char *print_hw_addr (htype, hlen, data)
-	int htype;
-	int hlen;
-	unsigned char *data;
+	const int htype;
+	const int hlen;
+	const unsigned char *data;
 {
 	static char habuf [49];
 	char *s;