svn commit: r202217 - in head: . include share/man/man5

[Ed Schouten]

Author: ed
Date: Wed Jan 13 19:03:48 2010
New Revision: 202217
URL: http://svn.freebsd.org/changeset/base/202217

Log:
  Remove <utmp.h> and its corresponding manual page.

Deleted:
  head/share/man/man5/utmp.5
Modified:
  head/ObsoleteFiles.inc
  head/include/utmp.h
  head/share/man/man5/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Jan 13 18:59:51 2010	(r202216)
+++ head/ObsoleteFiles.inc	Wed Jan 13 19:03:48 2010	(r202217)
@@ -25,6 +25,9 @@ OLD_FILES+=usr/share/man/man3/ulog_getut
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
+OLD_FILES+=usr/share/man/man5/lastlog.5.gz
+OLD_FILES+=usr/share/man/man5/utmp.5.gz
+OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h

Modified: head/include/utmp.h
==============================================================================
--- head/include/utmp.h	Wed Jan 13 18:59:51 2010	(r202216)
+++ head/include/utmp.h	Wed Jan 13 19:03:48 2010	(r202217)
@@ -1,73 +1,2 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
- */
-
-#ifndef	_UTMP_H_
-#define	_UTMP_H_
-
-#define	_PATH_UTMP	"/var/run/utmp"
-#define	_PATH_WTMP	"/var/log/wtmp"
-#define	_PATH_LASTLOG	"/var/log/lastlog"
-
-/*
- * XXX: These values are too low, but cannot be changed without breaking
- * the file format.  Right now pts(4) is limited to 1000 instances,
- * because /dev/pts/1000 would require UT_LINESIZE to be bigger.
- * UT_HOSTSIZE is also too small to hold most common hostnames or IPv6
- * addresses.
- */
-#define	UT_NAMESIZE	16	/* see MAXLOGNAME in <sys/param.h> */
-#define	UT_LINESIZE	8
-#define	UT_HOSTSIZE	16
-
-struct lastlog {
-	int32_t	ll_time;
-	char	ll_line[UT_LINESIZE];
-	char	ll_host[UT_HOSTSIZE];
-};
-
-struct utmp {
-	char	ut_line[UT_LINESIZE];
-	char	ut_name[UT_NAMESIZE];
-	char	ut_host[UT_HOSTSIZE];
-	int32_t	ut_time;
-};
-
-#endif /* !_UTMP_H_ */
+/* $FreeBSD$ */
+#error "<utmp.h> has been replaced by <utmpx.h>"

Modified: head/share/man/man5/Makefile
==============================================================================
--- head/share/man/man5/Makefile	Wed Jan 13 18:59:51 2010	(r202216)
+++ head/share/man/man5/Makefile	Wed Jan 13 19:03:48 2010	(r202217)
@@ -68,7 +68,6 @@ MAN=	acct.5 \
 	style.Makefile.5 \
 	sysctl.conf.5 \
 	tmpfs.5 \
-	utmp.5 \
 	xfs.5
 
 MLINKS=	dir.5 dirent.5
@@ -79,7 +78,6 @@ MLINKS+=passwd.5 master.passwd.5
 MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
-MLINKS+=utmp.5 lastlog.5 utmp.5 wtmp.5
 
 .if ${MK_HESIOD} != "no"
 MAN+=	hesiod.conf.5