--- /etc/master.passwd 2010-03-08 16:00:49.000000000 +0000
+++ ./etc/master.passwd 2010-08-23 01:04:12.000000000 +0100
@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/master.passwd,v 1.40 2005/06/06 20:19:56 brooks Exp $
+# $FreeBSD: src/etc/master.passwd,v 1.40.22.1 2009/08/03 08:13:06 kensmith Exp $
#
-root:*:0:0::0:0:Charlie &:/root:/bin/csh
+root::0:0::0:0:Charlie &:/root:/bin/csh
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
@@ -21,23 +21,3 @@
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
-dan:*:1001:1001::0:0:Dan Langille:/home/dan:/usr/local/bin/bash
-pgsql:*:70:70::0:0:PostgreSQL Daemon:/usr/local/pgsql:/bin/sh
-mysql:*:88:88::0:0:MySQL Daemon:/nonexistent:/sbin/nologin
-postfix:*:125:125::0:0:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin
-vscan:*:110:110::0:0:Scanning Virus Account:/var/amavis:/bin/sh
-spamd:*:58:58::0:0:SpamAssassin user:/var/spool/spamd:/sbin/nologin
-clamav:*:106:106::0:0:Clam Antivirus:/nonexistent:/sbin/nologin
-rosenqui:*:1003:1003::0:0:Eric Rosenquist:/home/rosenqui:/bin/tcsh
-nagios:*:1004:1004::0:0:Nagios pseudo-user:/usr/local/var/nagios:/nonexistent
-cacti:*:107:107::0:0:Cacti Sandbox:/nonexistent:/sbin/nologin
-_symon:*:115:1:daemon:0:0:Symon Account:/var/empty:/usr/sbin/nologin
-grzm:*:1005:1005::0:0:Michael Glaesemann:/home/grzm:/usr/local/bin/bash
-scponly:*:1006:1006::0:0:User &:/home/scponly:/usr/local/sbin/scponlyc
-stunnel:*:1007:1007::0:0:stunnel Daemon:/nonexistent:/sbin/nologin
-_spamd:*:132:132::0:0:spamd pseudo-user:/var/empty:/sbin/nologin
-dvl:*:1008:1008::0:0:Dan Langille (pop):/home/dvl:/usr/sbin/nologin
-dovecot:*:143:143::0:0:Dovecot User:/var/empty:/sbin/nologin
-dru:*LOCKED**:1009:1009::0:0:Dru Lavigne:/home/dru:/bin/tcsh
-logcheck:*:915:915::0:0:Logcheck system account:/var/db/logcheck:/usr/local/bin/bash
-munin:*:842:842::0:0:Munin:/var/munin:/usr/sbin/nologin
Use 'd' to delete the temporary ./etc/master.passwd
Use 'i' to install the temporary ./etc/master.passwd
Use 'm' to merge the temporary and installed versions
Use 'v' to view the diff results again
Default is to leave the temporary file to deal with by hand
How should I deal with this? [Leave it for later] i
*** ./etc/master.passwd installed successfully
*** Comparison complete
*** /var/tmp/temproot is empty, deleting
*** You installed a new master.passwd file, so make sure that you run
'/usr/sbin/pwd_mkdb -p /etc/master.passwd'
to rebuild your password files
Would you like to run it now? y or n [n] y
Running /usr/sbin/pwd_mkdb -p /etc/master.passwd
This entry was posted
on Sunday, August 22nd, 2010 at 11:36 pm and is filed under General.
You can follow any responses to this entry through the RSS 2.0 feed.
You can leave a response, or trackback from your own site.
September 1st, 2010 at 2:24 pm
I think I’m going to start using these mergemaster options:
I will add these to /etc/mergemaster.rc or $HOME/.mergemasterrc
March 2nd, 2011 at 9:05 pm
I just used these on an upgrade from 8.2-PRE to 8.2-STABLE. Wonderful.