summaryrefslogtreecommitdiff
path: root/usr.sbin/utx
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2014-04-28 07:50:45 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2014-04-28 07:50:45 +0000
commit3b8f08459569bf0faa21473e5cec2491e95c9349 (patch)
tree80f45dd81ca716bcd7ca9674581e1fc40b93cd34 /usr.sbin/utx
parent9d2ab4a62d6733c45958627ac113bdbd818d1e2a (diff)
parentb2ba55951383498f252746f618d513139da06e8e (diff)
downloadsrc-test2-3b8f08459569bf0faa21473e5cec2491e95c9349.tar.gz
src-test2-3b8f08459569bf0faa21473e5cec2491e95c9349.zip
Notes
Diffstat (limited to 'usr.sbin/utx')
-rw-r--r--usr.sbin/utx/Makefile3
-rw-r--r--usr.sbin/utx/utx.813
-rw-r--r--usr.sbin/utx/utx.c8
3 files changed, 4 insertions, 20 deletions
diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile
index a70c71c508e8..78c4f90160be 100644
--- a/usr.sbin/utx/Makefile
+++ b/usr.sbin/utx/Makefile
@@ -3,7 +3,4 @@
PROG= utx
MAN= utx.8
-LINKS= ${BINDIR}/utx ${BINDIR}/utxrm
-MLINKS= utx.8 utxrm.8
-
.include <bsd.prog.mk>
diff --git a/usr.sbin/utx/utx.8 b/usr.sbin/utx/utx.8
index c3e71e259dfa..363a46a281d4 100644
--- a/usr.sbin/utx/utx.8
+++ b/usr.sbin/utx/utx.8
@@ -24,12 +24,11 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 11, 2012
+.Dd November 3, 2013
.Dt UTX 8
.Os
.Sh NAME
-.Nm utx ,
-.Nm utxrm
+.Nm utx
.Nd manage the user accounting database
.Sh SYNOPSIS
.Nm
@@ -40,9 +39,6 @@
.Cm rm
.Ar identifier
.Ar ...
-.Nm utxrm
-.Ar identifier
-.Ar ...
.Sh DESCRIPTION
The
.Nm
@@ -82,11 +78,6 @@ accounting database's active session table, including its identifiers:
Identifiers can either be supplied in hexadecimal form as displayed by
.Xr getent 1 ,
or as a string if the identifier allows such a representation.
-.Pp
-To remain backward compatible, this action can also be invoked directly
-by using the
-.Nm utxrm
-command.
.El
.Pp
Because this utility requires write-access to the user accounting
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 99d9591ff3fe..59edf3b47c36 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -95,10 +95,7 @@ int
main(int argc, char *argv[])
{
- if (argc >= 2 && strcmp(getprogname(), "utxrm") == 0)
- /* For compatibility. */
- return (rm(&argv[1]));
- else if (argc == 2 && strcmp(argv[1], "boot") == 0)
+ if (argc == 2 && strcmp(argv[1], "boot") == 0)
return (boot(BOOT_TIME));
else if (argc == 2 && strcmp(argv[1], "shutdown") == 0)
return (boot(SHUTDOWN_TIME));
@@ -108,7 +105,6 @@ main(int argc, char *argv[])
fprintf(stderr,
"usage: utx boot\n"
" utx shutdown\n"
- " utx rm identifier ...\n"
- " utxrm identifier ...\n");
+ " utx rm identifier ...\n");
exit(1);
}