From: Jelte Jansen <jelte@NLnetLabs.nl>
Date: Wed, 30 Jul 2008 13:35:27 +0000 (+0000)
Subject: copyright notice for bubblebabble code
X-Git-Tag: release-1.4.0~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a38581ca4db3aa659d1c13fea7df82d3aa92bd01;p=thirdparty%2Fldns.git

copyright notice for bubblebabble code
sometimes resolv.conf comments ate up actual directive on next line
---

diff --git a/resolver.c b/resolver.c
index c12252ea..9ac57d7c 100644
--- a/resolver.c
+++ b/resolver.c
@@ -671,11 +671,6 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
 							break;
 						}
 					}
-					if (word[0] == '#') {
-						/* skip the rest of the line*/
-						gtr = ldns_fget_token_l(fp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
-						continue;
-					}
 					/* no keyword recognized */
 					if (expect == LDNS_RESOLV_KEYWORD) {
 						/* skip line */
diff --git a/util.c b/util.c
index 75444569..01563325 100644
--- a/util.c
+++ b/util.c
@@ -318,6 +318,10 @@ ldns_init_random(FILE *fd, unsigned int size)
 	return 0;
 }
 
+/*
+ * BubbleBabble code taken from OpenSSH
+ * Copyright (c) 2001 Carsten Raskgaard.  All rights reserved.
+ */
 char *
 ldns_bubblebabble(uint8_t *data, size_t len)
 {