From 06d7c247a74df9087082b0b9e13ff79c3975ed3c Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 13 Sep 2016 15:38:17 +0000
Subject: [PATCH] proxy uid/gid was split up for seperate purposes; it can go
 away now.

---
 src/etc/group         | 1 -
 src/etc/mail/aliases  | 3 +--
 src/etc/master.passwd | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/etc/group b/src/etc/group
index 6df45b28..67602333 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -36,7 +36,6 @@ crontab:*:66:
 www:*:67:
 _isakmpd:*:68:
 network:*:69:
-proxy:*:71:
 authpf:*:72:
 _syslogd:*:73:
 _pflogd:*:74:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 41035656..fe08bf1a 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.56 2016/03/05 12:31:38 espie Exp $
+#	$OpenBSD: aliases,v 1.57 2016/09/13 15:38:17 deraadt Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -71,7 +71,6 @@ _x11:   /dev/null
 _ypldap: /dev/null
 bin:	/dev/null
 nobody:	/dev/null
-proxy:  /dev/null		# remove in 6.0
 _tftp_proxy: /dev/null
 _ftp_proxy: /dev/null
 _sndiop: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 1f669c2c..1bad2770 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -20,7 +20,6 @@ _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin
 www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
 _isakmpd:*:68:68::0:0:isakmpd privsep:/var/empty:/sbin/nologin
-proxy:*:71:71::0:0:Old proxy daemon (remove in 6.0):/nonexistent:/sbin/nologin
 _syslogd:*:73:73::0:0:Syslog Daemon:/var/empty:/sbin/nologin
 _pflogd:*:74:74::0:0:pflogd privsep:/var/empty:/sbin/nologin
 _bgpd:*:75:75::0:0:BGP Daemon:/var/empty:/sbin/nologin