svn commit: r202216 - in head: . lib/libutil

[Ed Schouten]

Author: ed
Date: Wed Jan 13 18:59:51 2010
New Revision: 202216
URL: http://svn.freebsd.org/changeset/base/202216

Log:
  Remove login(3), logout(3) and logwtmp(3) from libutil.
  
  These functions only apply to utmp(5). They cannot be kept intact when
  moving towards utmpx. The login(3) function would break, because its
  argument is an utmp structure. The logout(3) and logwtmp(3) functions
  cannot be used, since they provide a functionality which partially
  overlaps.
  
  Increment SHLIB_MAJOR to 9 to indicate the removal.

Deleted:
  head/lib/libutil/login.3
  head/lib/libutil/login.c
  head/lib/libutil/logout.3
  head/lib/libutil/logout.c
  head/lib/libutil/logwtmp.3
  head/lib/libutil/logwtmp.c
Modified:
  head/ObsoleteFiles.inc
  head/lib/libutil/Makefile
  head/lib/libutil/libutil.h

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Jan 13 18:53:06 2010	(r202215)
+++ head/ObsoleteFiles.inc	Wed Jan 13 18:59:51 2010	(r202216)
@@ -15,6 +15,9 @@
 #
 
 # 20100113: remove utmp.h, replace it by utmpx.h
+OLD_FILES+=usr/share/man/man3/login.3.gz
+OLD_FILES+=usr/share/man/man3/logout.3.gz
+OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
@@ -22,6 +25,7 @@ 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_LIBS+=lib/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed

Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile	Wed Jan 13 18:53:06 2010	(r202215)
+++ head/lib/libutil/Makefile	Wed Jan 13 18:59:51 2010	(r202216)
@@ -6,13 +6,13 @@ SHLIBDIR?= /lib
 .include <bsd.own.mk>
 
 LIB=	util
-SHLIB_MAJOR= 8
+SHLIB_MAJOR= 9
 
 SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
 	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getvmmap.c kld.c \
-	login.c login_auth.c login_cap.c \
+	login_auth.c login_cap.c \
 	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
-	logout.c logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
+	pidfile.c property.c pty.c pw_util.c realhostname.c \
 	stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
@@ -24,7 +24,7 @@ CFLAGS+= -DINET6
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 
-MAN+=	kld.3 login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
+MAN+=	kld.3 login_auth.3 login_tty.3 pty.3 \
 	login_cap.3 login_class.3 login_times.3 login_ok.3 \
 	_secure_path.3 uucplock.3 property.3 auth.3 realhostname.3 \
 	realhostname_sa.3 trimdomain.3 fparseln.3 humanize_number.3 \

Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h	Wed Jan 13 18:53:06 2010	(r202215)
+++ head/lib/libutil/libutil.h	Wed Jan 13 18:59:51 2010	(r202216)
@@ -90,7 +90,6 @@ struct pidfh {
 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;
-struct utmp;
 struct in_addr;
 struct kinfo_file;
 struct kinfo_vmentry;
@@ -102,10 +101,7 @@ int	extattr_namespace_to_string(int _att
 int	extattr_string_to_namespace(const char *_string, int *_attrnamespace);
 int	flopen(const char *_path, int _flags, ...);
 void	hexdump(const void *ptr, int length, const char *hdr, int flags);
-void	login(struct utmp *_ut);
 int	login_tty(int _fd);
-int	logout(const char *_line);
-void	logwtmp(const char *_line, const char *_name, const char *_host);
 void	trimdomain(char *_fullhost, int _hostsize);
 int	openpty(int *_amaster, int *_aslave, char *_name,
 		     struct termios *_termp, struct winsize *_winp);