Date: Thu, 21 Jan 2010 17:25:13 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202756 - in head: bin/date lib/libpam/modules/pam_lastlog libexec/comsat libexec/ftpd sbin/init sbin/reboot share/man/man3 share/man/man7 share/security usr.bin/at usr.bin/finger usr.b... Message-ID: <201001211725.o0LHPDGG093800@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Thu Jan 21 17:25:12 2010 New Revision: 202756 URL: http://svn.freebsd.org/changeset/base/202756 Log: Remove stale references to utmp(5) and its corresponding filenames. I removed utmp and its manpage, but not other manpages referring to it. Modified: head/bin/date/date.1 head/lib/libpam/modules/pam_lastlog/pam_lastlog.8 head/libexec/comsat/comsat.8 head/libexec/ftpd/ftpd.8 head/sbin/init/init.8 head/sbin/reboot/reboot.8 head/share/man/man3/sysexits.3 head/share/man/man7/hier.7 head/share/security/lomac-policy.contexts head/usr.bin/at/at.man head/usr.bin/finger/finger.1 head/usr.bin/last/last.1 head/usr.bin/ncplist/ncplist.1 head/usr.bin/talk/talk.1 head/usr.bin/users/users.1 head/usr.bin/w/w.1 head/usr.bin/who/who.1 head/usr.sbin/ac/ac.8 head/usr.sbin/lastlogin/lastlogin.8 head/usr.sbin/rwhod/rwhod.8 Modified: head/bin/date/date.1 ============================================================================== --- head/bin/date/date.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/bin/date/date.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -299,7 +299,7 @@ for more information. .El .Sh FILES .Bl -tag -width /var/log/messages -compact -.It Pa /var/log/wtmp +.It Pa /var/log/utx.log record of date resets and time changes .It Pa /var/log/messages record of the user setting the time @@ -406,9 +406,9 @@ fails. .Sh SEE ALSO .Xr locale 1 , .Xr gettimeofday 2 , +.Xr getutxent 3 , .Xr strftime 3 , .Xr strptime 3 , -.Xr utmp 5 , .Xr timed 8 .Rs .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD" Modified: head/lib/libpam/modules/pam_lastlog/pam_lastlog.8 ============================================================================== --- head/lib/libpam/modules/pam_lastlog/pam_lastlog.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/lib/libpam/modules/pam_lastlog/pam_lastlog.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -65,12 +65,7 @@ and terminate sessions. The .Fn pam_sm_open_session -function records the session in the -.Xr utmp 5 , -.Xr wtmp 5 -and -.Xr lastlog 5 -databases. +function records the session in the user accounting database. The .Fn pam_sm_close_session function does nothing. @@ -90,10 +85,10 @@ Ignore I/O failures. .Sh SEE ALSO .Xr last 1 , .Xr w 1 , +.Xr getutxent 3 , .Xr login 3 , .Xr logout 3 , .Xr pam.conf 5 , -.Xr utmp 5 , .Xr lastlogin 8 , .Xr pam 8 .Sh AUTHORS Modified: head/libexec/comsat/comsat.8 ============================================================================== --- head/libexec/comsat/comsat.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/libexec/comsat/comsat.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -91,7 +91,7 @@ If omitted, standard mailbox assumed. .Sh FILES .Bl -tag -width ".Pa /var/mail/user" -compact -.It Pa /var/run/utmp +.It Pa /var/run/utx.active to find out who is logged on and on what terminals .It Pa /var/mail/user standard mailbox Modified: head/libexec/ftpd/ftpd.8 ============================================================================== --- head/libexec/ftpd/ftpd.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/libexec/ftpd/ftpd.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -219,8 +219,7 @@ This option may be overridden by A synonym for .Fl d . .It Fl W -Do not log FTP sessions to -.Pa /var/log/wtmp . +Do not log FTP sessions to the user accounting database. .El .Pp The file Modified: head/sbin/init/init.8 ============================================================================== --- head/sbin/init/init.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/sbin/init/init.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -148,12 +148,9 @@ dies, either because the user logged out or an abnormal termination occurred (a signal), the .Nm -utility wakes up, deletes the user -from the -.Xr utmp 5 -file of current users and records the logout in the -.Xr wtmp 5 -file. +utility wakes up and records the logout in the the user accounting +database (see +.Xr getutxent 3 ). The cycle is then restarted by .Nm @@ -207,13 +204,6 @@ If a line is commented out or deleted fr .Xr ttys 5 , .Nm will not do anything at all to that line. -However, it will complain that the relationship between lines -in the -.Xr ttys 5 -file and records in the -.Xr utmp 5 -file is out of sync, -so this practice is not recommended. .Pp The .Nm @@ -316,9 +306,9 @@ system console device .It Pa /dev/tty* terminal ports found in .Xr ttys 5 -.It Pa /var/run/utmp +.It Pa /var/run/utx.active record of current users on the system -.It Pa /var/log/wtmp +.It Pa /var/log/utx.log record of all logins and logouts .It Pa /etc/ttys the terminal initialization information file Modified: head/sbin/reboot/reboot.8 ============================================================================== --- head/sbin/reboot/reboot.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/sbin/reboot/reboot.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -61,9 +61,8 @@ a (and subsequently a .Dv SIGKILL ) and, respectively, halt or restart the system. -The action is logged, including entering a shutdown record into the -.Xr wtmp 5 -file. +The action is logged, including entering a shutdown record into the user +accounting database. .Pp The options are as follows: .Bl -tag -width indent Modified: head/share/man/man3/sysexits.3 ============================================================================== --- head/share/man/man3/sysexits.3 Thu Jan 21 16:56:27 2010 (r202755) +++ head/share/man/man3/sysexits.3 Thu Jan 21 17:25:12 2010 (r202756) @@ -97,7 +97,7 @@ does not exist in the passwd file. .It Sy EX_OSFILE Pq 72 Some system file (e.g., .Pa /etc/passwd , -.Pa /var/run/utmp , +.Pa /var/run/utx.active , etc.) does not exist, cannot be opened, or has some sort of error (e.g., syntax error). .It Sy EX_CANTCREAT Pq 73 Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Thu Jan 21 16:56:27 2010 (r202755) +++ head/share/man/man7/hier.7 Thu Jan 21 17:25:12 2010 (r202756) @@ -735,10 +735,14 @@ kerberos server databases; see miscellaneous system log files .Pp .Bl -tag -width Fl -compact -.It Pa wtmp +.It Pa utx.lastlogin +last login log; +see +.Xr getutxent 3 +.It Pa utx.log login/logout log; see -.Xr wtmp 5 +.Xr getutxent 3 .El .Pp .It Pa mail/ @@ -769,10 +773,10 @@ writable by the .Dq network group for command connection sockets; see .Xr ppp 8 -.It Pa utmp +.It Pa utx.active database of current users; see -.Xr utmp 5 +.Xr getutxent 5 .El .Pp .It Pa rwho/ Modified: head/share/security/lomac-policy.contexts ============================================================================== --- head/share/security/lomac-policy.contexts Thu Jan 21 16:56:27 2010 (r202755) +++ head/share/security/lomac-policy.contexts Thu Jan 21 17:25:12 2010 (r202756) @@ -25,5 +25,5 @@ (/mnt)?/cdrom(/.*)? lomac/high (/usr)?/home/(ftp|samba)(/.*)? lomac/high /var/log/sendmail\.st lomac/low -/var/run/utmp lomac/equal -/var/log/(lastlog|wtmp) lomac/equal +/var/run/utx.active lomac/equal +/var/log/utx.(lastlogin|log) lomac/equal Modified: head/usr.bin/at/at.man ============================================================================== --- head/usr.bin/at/at.man Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/at/at.man Thu Jan 21 17:25:12 2010 (r202756) @@ -313,7 +313,7 @@ letter pair is not specified, the value directory containing job files .It Pa _ATSPOOL_DIR directory containing output spool files -.It Pa /var/run/utmp +.It Pa /var/run/utx.active login records .It Pa _PERM_PATH/at.allow allow permission control @@ -338,7 +338,7 @@ with minor enhancements by .An Joe Halpin Aq joe.halpin@attbi.com . .Sh BUGS If the file -.Pa /var/run/utmp +.Pa /var/run/utx.active is not available or corrupted, or if the user is not logged on at the time .Nm Modified: head/usr.bin/finger/finger.1 ============================================================================== --- head/usr.bin/finger/finger.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/finger/finger.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -100,8 +100,7 @@ of the remote host when used in conjunct .Fl h option. .It Fl k -Disable all use of -.Xr utmp 5 . +Disable all use of the user accounting database. .It Fl l Produce a multi-line format displaying all of the information described for the @@ -221,10 +220,10 @@ This variable may be set with favored op .Nm . .El .Sh FILES -.Bl -tag -width /var/log/lastlog -compact +.Bl -tag -width /var/log/utx.lastlogin -compact .It Pa /etc/finger.conf alias definition data base -.It Pa /var/log/lastlog +.It Pa /var/log/utx.lastlogin last login data base .El .Sh SEE ALSO Modified: head/usr.bin/last/last.1 ============================================================================== --- head/usr.bin/last/last.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/last/last.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -83,7 +83,7 @@ be reported. This may be used with the .Fl f option to derive the results from stored -.Pa wtmp +.Pa utx.log files. When this argument is provided, all other options except for .Fl f @@ -141,7 +141,7 @@ letter pair is not specified, the value Read the file .Ar file instead of the default, -.Pa /var/log/wtmp . +.Pa /var/log/utx.log . .It Fl h Ar host .Ar Host names may be names or internet numbers. @@ -196,13 +196,13 @@ If interrupted with a quit signal indicates how far the search has progressed and then continues. .Sh FILES -.Bl -tag -width /var/log/wtmp -compact -.It Pa /var/log/wtmp +.Bl -tag -width /var/log/utx.log -compact +.It Pa /var/log/utx.log login data base .El .Sh SEE ALSO .Xr lastcomm 1 , -.Xr utmp 5 , +.Xr getutxent 3 , .Xr ac 8 .Sh HISTORY A @@ -212,7 +212,7 @@ utility appeared in .Sh BUGS If a login shell should terminate abnormally for some reason, it is likely that a logout record will not be written to the -.Pa wtmp +.Pa utx.log file. In this case, .Nm Modified: head/usr.bin/ncplist/ncplist.1 ============================================================================== --- head/usr.bin/ncplist/ncplist.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/ncplist/ncplist.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -69,7 +69,7 @@ Displays mounted volumes on a given .Sh IMPLEMENTATION NOTES This utility is provided mostly for educational purposes. .Sh FILES -.Bl -tag -width /var/log/wtmp -compact +.Bl -tag -width /var/log/utx.log -compact .It Pa ~/.nwfsrc keeps description for each connection. See Modified: head/usr.bin/talk/talk.1 ============================================================================== --- head/usr.bin/talk/talk.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/talk/talk.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -116,10 +116,10 @@ Permission to talk may be denied or gran command. At the outset talking is allowed. .Sh FILES -.Bl -tag -width /var/run/utmp -compact +.Bl -tag -width /var/run/utx.active -compact .It Pa /etc/hosts to find the recipient's machine -.It Pa /var/run/utmp +.It Pa /var/run/utx.active to find the recipient's tty .El .Sh SEE ALSO Modified: head/usr.bin/users/users.1 ============================================================================== --- head/usr.bin/users/users.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/users/users.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -46,14 +46,14 @@ The utility lists the login names of the users currently on the system, in sorted order, space separated, on a single line. .Sh FILES -.Bl -tag -width /var/run/utmp -.It Pa /var/run/utmp +.Bl -tag -width /var/run/utx.active +.It Pa /var/run/utx.active .El .Sh SEE ALSO .Xr finger 1 , .Xr last 1 , .Xr who 1 , -.Xr utmp 5 +.Xr getutxent 3 .Sh HISTORY The .Nm Modified: head/usr.bin/w/w.1 ============================================================================== --- head/usr.bin/w/w.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/w/w.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -87,8 +87,8 @@ If one or more .Ar user names are specified, the output is restricted to those users. .Sh FILES -.Bl -tag -width ".Pa /var/run/utmp" -compact -.It Pa /var/run/utmp +.Bl -tag -width ".Pa /var/run/utx.active" -compact +.It Pa /var/run/utx.active list of users on the system .El .Sh COMPATIBILITY Modified: head/usr.bin/who/who.1 ============================================================================== --- head/usr.bin/who/who.1 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.bin/who/who.1 Thu Jan 21 17:25:12 2010 (r202756) @@ -90,36 +90,36 @@ Equivalent to By default, .Nm gathers information from the file -.Pa /var/run/utmp . +.Pa /var/run/utx.active . An alternate .Ar file may be specified which is usually -.Pa /var/log/wtmp +.Pa /var/log/utx.log (or -.Pa /var/log/wtmp.[0-6] +.Pa /var/log/utx.log.[0-6] depending on site policy as -.Pa wtmp +.Pa utx.log can grow quite large and daily versions may or may not be kept around after compression by .Xr ac 8 ) . The -.Pa wtmp +.Pa utx.log file contains a record of every login, logout, crash, shutdown and date change since -.Pa wtmp +.Pa utx.log was last truncated or created. .Pp If -.Pa /var/log/wtmp +.Pa /var/log/utx.log is being used as the file, the user name may be empty or one of the special characters '|', '}' and '~'. Logouts produce an output line without any user name. For more information on the special characters, see -.Xr utmp 5 . +.Xr getutxent 3 . .Sh ENVIRONMENT The .Ev COLUMNS , LANG , LC_ALL @@ -130,10 +130,10 @@ environment variables affect the executi as described in .Xr environ 7 . .Sh FILES -.Bl -tag -width /var/log/wtmp.[0-6] -compact -.It Pa /var/run/utmp -.It Pa /var/log/wtmp -.It Pa /var/log/wtmp.[0-6] +.Bl -tag -width /var/log/utx.log.[0-6] -compact +.It Pa /var/run/utx.active +.It Pa /var/log/utx.log +.It Pa /var/log/utx.log.[0-6] .El .Sh EXIT STATUS .Ex -std @@ -141,7 +141,7 @@ as described in .Xr last 1 , .Xr users 1 , .Xr w 1 , -.Xr utmp 5 +.Xr getutxent 3 .Sh STANDARDS The .Nm Modified: head/usr.sbin/ac/ac.8 ============================================================================== --- head/usr.sbin/ac/ac.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.sbin/ac/ac.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -45,7 +45,7 @@ .Op Ar users ... .Sh DESCRIPTION If the file -.Pa /var/log/wtmp +.Pa /var/log/utx.log exists, a record of individual login and logout times are written to it by .Xr login 1 @@ -86,7 +86,7 @@ flags may be specified. Read connect time data from .Ar wtmp instead of the default file, -.Pa /var/log/wtmp . +.Pa /var/log/utx.log . .It Ar users ... Display totals for the given individuals only. .El @@ -95,20 +95,20 @@ If no arguments are given, .Nm displays the total connect time for all accounts with login sessions recorded in -.Pa wtmp . +.Pa utx.log . .Pp The default -.Pa wtmp +.Pa utx.log file will increase without bound unless it is truncated. It is normally truncated by the daily scripts run by .Xr cron 8 , which rename and rotate the -.Pa wtmp +.Pa utx.log files, keeping a week's worth of data on hand. No login or connect time accounting is performed if -.Pa /var/log/wtmp +.Pa /var/log/utx.log does not exist. .Pp For example, @@ -122,15 +122,15 @@ allows times recorded in to be charged out at a different rate than .Pa other . .Sh FILES -.Bl -tag -width /var/log/wtmp -compact -.It Pa /var/log/wtmp +.Bl -tag -width /var/log/utx.log -compact +.It Pa /var/log/utx.log connect time accounting file .El .Sh EXIT STATUS .Ex -std .Sh SEE ALSO .Xr login 1 , -.Xr utmp 5 , +.Xr getutxent 3 , .Xr init 8 , .Xr sa 8 .\" .Sh NOTES Modified: head/usr.sbin/lastlogin/lastlogin.8 ============================================================================== --- head/usr.sbin/lastlogin/lastlogin.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.sbin/lastlogin/lastlogin.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -64,13 +64,13 @@ utility differs from in that it only prints information regarding the very last login session. The last login database is never turned over or deleted in standard usage. .Sh FILES -.Bl -tag -width /var/log/lastlog -compact -.It Pa /var/log/lastlog +.Bl -tag -width /var/log/utx.lastlogin -compact +.It Pa /var/log/utx.lastlogin last login database .El .Sh SEE ALSO .Xr last 1 , -.Xr lastlog 5 , +.Xr getutxent 3 , .Xr ac 8 .Sh AUTHORS .An John M. Vinopal Modified: head/usr.sbin/rwhod/rwhod.8 ============================================================================== --- head/usr.sbin/rwhod/rwhod.8 Thu Jan 21 16:56:27 2010 (r202755) +++ head/usr.sbin/rwhod/rwhod.8 Thu Jan 21 17:25:12 2010 (r202756) @@ -188,9 +188,8 @@ system call, with any trailing domain na The array at the end of the message contains information about the users logged in to the sending machine. This information -includes the contents of the -.Xr utmp 5 -entry for each non-idle terminal line and a value indicating the +includes the contents of the entry from the user accounting database +for each non-idle terminal line and a value indicating the time in seconds since a character was last received on the terminal line. .Pp Messages received by the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001211725.o0LHPDGG093800>