From owner-freebsd-commit  Sat Jan  6 21:49:05 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17468
          for freebsd-commit-outgoing; Sat, 6 Jan 1996 21:49:05 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17456
          for cvs-all-outgoing; Sat, 6 Jan 1996 21:48:56 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17446
          for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 21:48:53 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17439
          Sat, 6 Jan 1996 21:48:52 -0800 (PST)
Date: Sat, 6 Jan 1996 21:48:52 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199601070548.VAA17439@freefall.freebsd.org>
To: CVS-committers, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/named/xfer Makefile named-xfer.c
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

peter       96/01/06 21:48:51

  Modified:    usr.sbin/named  Makefile db_dump.c db_func.h db_glob.h
                        db_glue.c db_load.c  db_lookup.c db_secure.c
                        db_update.c dmalloc.c ns_defs.h  ns_forw.c
                        ns_glob.h ns_init.c ns_main.c ns_maint.c
                        ns_ncache.c  ns_req.c ns_resp.c ns_sort.c
                        ns_validate.c options.h  portability.h
               usr.sbin/named/tools/ndc  ndc.sh
               usr.sbin/named/xfer  Makefile named-xfer.c
  Log:
  Round 1 of the conflict merge. It now compiles..
  
  Revision  Changes    Path
  1.8       +1 -1      src/usr.sbin/named/Makefile
  1.5       +11 -5     src/usr.sbin/named/db_dump.c
  1.4       +4 -3      src/usr.sbin/named/db_func.h
  1.3       +3 -3      src/usr.sbin/named/db_glob.h
  1.5       +75 -46    src/usr.sbin/named/db_glue.c
  1.5       +97 -50    src/usr.sbin/named/db_load.c
  1.4       +7 -2      src/usr.sbin/named/db_lookup.c
  1.4       +6 -14     src/usr.sbin/named/db_secure.c
  1.4       +4 -7      src/usr.sbin/named/db_update.c
  1.4       +3 -1      src/usr.sbin/named/dmalloc.c
  1.4       +12 -2     src/usr.sbin/named/ns_defs.h
  1.5       +69 -32    src/usr.sbin/named/ns_forw.c
  1.5       +8 -2      src/usr.sbin/named/ns_glob.h
  1.5       +32 -20    src/usr.sbin/named/ns_init.c
  1.6       +64 -87    src/usr.sbin/named/ns_main.c
  1.5       +280 -176  src/usr.sbin/named/ns_maint.c
  1.4       +1 -1      src/usr.sbin/named/ns_ncache.c
  1.5       +72 -66    src/usr.sbin/named/ns_req.c
  1.5       +396 -342  src/usr.sbin/named/ns_resp.c
  1.4       +3 -1      src/usr.sbin/named/ns_sort.c
  1.4       +48 -49    src/usr.sbin/named/ns_validate.c
  1.5       +4 -3      src/usr.sbin/named/options.h
  1.4       +22 -2     src/usr.sbin/named/portability.h
  1.3       +23 -12    src/usr.sbin/named/tools/ndc/ndc.sh
  1.8       +1 -1      src/usr.sbin/named/xfer/Makefile
  1.5       +22 -12    src/usr.sbin/named/xfer/named-xfer.c