]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
copyright notice for bubblebabble code
authorJelte Jansen <jelte@NLnetLabs.nl>
Wed, 30 Jul 2008 13:35:27 +0000 (13:35 +0000)
committerJelte Jansen <jelte@NLnetLabs.nl>
Wed, 30 Jul 2008 13:35:27 +0000 (13:35 +0000)
sometimes resolv.conf comments ate up actual directive on next line

resolver.c
util.c

index c12252ea96a6f4174690b1cc1ef3ca95eaffe83e..9ac57d7ccfa88001671cdade17c7b78809e80ca3 100644 (file)
@@ -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 754445699472336cd8570d371610ad98b304dd85..0156332537ffaa238616c81f1a627c013de1c4f5 100644 (file)
--- 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)
 {