From owner-cvs-libexec  Sun Jun 29 12:04:24 1997
Return-Path: <owner-cvs-libexec>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id MAA13635
          for cvs-libexec-outgoing; Sun, 29 Jun 1997 12:04:24 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA13558;
          Sun, 29 Jun 1997 12:02:13 -0700 (PDT)
From: Steve Price <steve@FreeBSD.ORG>
Received: (from steve@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id MAA06586;
	Sun, 29 Jun 1997 12:00:32 -0700 (PDT)
Date: Sun, 29 Jun 1997 12:00:32 -0700 (PDT)
Message-Id: <199706291900.MAA06586@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-libexec@FreeBSD.ORG
Subject: cvs commit: src/libexec/rbootd Makefile bpf.c conf.c defs.h
         parseconf.c pathnames.h rbootd.8 rbootd.c rmp.h rmp_var.h
         rmpproto.c utils.c
Sender: owner-cvs-libexec@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

steve       1997/06/29 12:00:32 PDT

  Modified files:
    libexec/rbootd       Makefile bpf.c conf.c defs.h parseconf.c 
                         pathnames.h rbootd.8 rbootd.c rmp.h 
                         rmp_var.h rmpproto.c utils.c 
  Log:
  Merge conflicts and make this compile -Wall clean.
  
  Revision  Changes    Path
  1.8       +2 -7      src/libexec/rbootd/Makefile
  1.7       +10 -15    src/libexec/rbootd/bpf.c
  1.2       +7 -7      src/libexec/rbootd/conf.c
  1.2       +9 -10     src/libexec/rbootd/defs.h
  1.6       +7 -8      src/libexec/rbootd/parseconf.c
  1.2       +2 -2      src/libexec/rbootd/pathnames.h
  1.7       +3 -3      src/libexec/rbootd/rbootd.8
  1.7       +16 -78    src/libexec/rbootd/rbootd.c
  1.2       +12 -12    src/libexec/rbootd/rmp.h
  1.2       +48 -48    src/libexec/rbootd/rmp_var.h
  1.2       +30 -23    src/libexec/rbootd/rmpproto.c
  1.2       +25 -26    src/libexec/rbootd/utils.c