From 0909c6d1d870709e79f43c2b5a22fe48976d7286 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 6 Dec 2012 11:54:25 +0000
Subject: [PATCH] Early MFC of portions of r243752 adding an auditdistd user to
 stable/8 in order to ease future upgrades; the remainder of r243752 is left
 for a future MFC of the OpenBSM upgrade:

  Merge a number of changes required to hook up OpenBSM 1.2-alpha2's
  auditdistd (distributed audit daemon) to the build:

  - Manual cross references
  - Makefile for auditdistd
  - rc.d script, rc.conf entrie
  - New group and user for auditdistd; associated aliases, etc.

  The audit trail distribution daemon provides reliable,
  cryptographically protected (and sandboxed) delivery of audit tails
  from live clients to audit server hosts in order to both allow
  centralised analysis, and improve resilience in the event of client
  compromises: clients are not permitted to change trail contents
  after submission.

  Submitted by:   pjd
  Sponsored by:   The FreeBSD Foundation (auditdistd)


git-svn-id: svn://svn.freebsd.org/base/stable/8@243948 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/ftpusers      | 1 +
 etc/mail/aliases  | 1 +
 etc/master.passwd | 1 +
 3 files changed, 3 insertions(+)

diff --git a/etc/ftpusers b/etc/ftpusers
index 06b3f498b..adb9dcf3b 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -19,6 +19,7 @@ _pflogd
 _dhcp
 uucp
 pop
+auditdistd
 www
 hast
 nobody
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 5f5cd248f..46f5f644b 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -26,6 +26,7 @@ postmaster: root
 # General redirections for pseudo accounts
 _dhcp:	root
 _pflogd: root
+auditdistd:	root
 bin:	root
 bind:	root
 daemon:	root
diff --git a/etc/master.passwd b/etc/master.passwd
index 02163ef43..2d014af63 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -19,6 +19,7 @@ _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
 _dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
 uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
+auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
 www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
 hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
-- 
2.45.0