Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/dist/bind/lib/irs Pull up revision 1.2 (requested by it...



details:   https://anonhg.NetBSD.org/src/rev/ed6eb42945b7
branches:  netbsd-1-4
changeset: 470462:ed6eb42945b7
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 01 14:01:21 2000 +0000

description:
Pull up revision 1.2 (requested by itojun):
  Make BIND8 not use the BIND4 code in libc.

diffstat:

 dist/bind/lib/irs/gen.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r a1d7dfbfe795 -r ed6eb42945b7 dist/bind/lib/irs/gen.c
--- a/dist/bind/lib/irs/gen.c   Wed Mar 01 14:00:58 2000 +0000
+++ b/dist/bind/lib/irs/gen.c   Wed Mar 01 14:01:21 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gen.c,v 1.1.1.1.2.2 1999/12/04 17:00:45 he Exp $       */
+/*     $NetBSD: gen.c,v 1.1.1.1.2.3 2000/03/01 14:01:21 he Exp $       */
 
 /*
  * Copyright (c) 1996-1999 by Internet Software Consortium.
@@ -382,6 +382,13 @@
 
 static void
 init_map_rules(struct gen_p *irs, const char *conf_file) {
+#ifdef __NetBSD__
+       /*
+        * We don't read irs.conf here.  It adds too much complexity to
+        * the complex situation with "BIND4 in libc" + "BIND8 in userland"
+        */
+       default_map_rules(irs);
+#else
        char line[1024], pattern[40], mapname[20], accname[20], options[100];
        FILE *conf;
 
@@ -426,4 +433,5 @@
                add_rule(irs, map, acc, options);
        }
        fclose(conf);
+#endif
 }



Home | Main Index | Thread Index | Old Index