2000-02-08 Roland McGrath <roland@baalperazim.frob.com>

	Remove the su utility, which is incompatible with traditional su
	as provided by sh-utils and used by some portable shell scripts.
	The Hurdish su functionality is available as `setauth --save'.
	* su.c: File removed.
	* Makefile (targets): Remove su.
	(SRCS): Remove su.c.
	(su): Target removed from various dependency rules.
	(su-LDLIBS): Variable removed.
	* unsu.c (doc): Refer to setauth --save rather than su.

4 files changed, 24 insertions, 15 deletions

diff --git a/utils/ChangeLog b/utils/ChangeLog
index a9049a23..411a5664 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,15 @@
+2000-02-08  Roland McGrath  <roland@baalperazim.frob.com>
+
+	Remove the su utility, which is incompatible with traditional su
+	as provided by sh-utils and used by some portable shell scripts.
+	The Hurdish su functionality is available as `setauth --save'.
+	* su.c: File removed.
+	* Makefile (targets): Remove su.
+	(SRCS): Remove su.c.
+	(su): Target removed from various dependency rules.
+	(su-LDLIBS): Variable removed.
+	* unsu.c (doc): Refer to setauth --save rather than su.
+
 2000-01-22  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* nonsugid.c (get_nonsugid_ids): Remove saved set IDs from available
diff --git a/utils/Makefile b/utils/Makefile
index fd8035be..6e36390d 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,5 +1,5 @@
 #
-#   Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+#   Copyright (C) 1994,95,96,97,98,99,2000 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -18,12 +18,12 @@
 dir := utils
 makemode := utilities
 
-targets = shd ps settrans showtrans syncfs su fsysopts \
+targets = shd ps settrans showtrans syncfs fsysopts \
 	storeinfo login w uptime ids loginpr sush vmstat portinfo \
 	devprobe vminfo addauth rmauth unsu setauth ftpcp ftpdir storecat \
 	storeread ping msgport rpctrace mount
 special-targets = loginpr sush uptime
-SRCS = shd.c ps.c su.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \
+SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \
 	fsysopts.c storeinfo.c login.c loginpr.sh sush.sh w.c \
 	uptime.sh psout.c ids.c vmstat.c portinfo.c devprobe.c vminfo.c \
 	parse.c frobauth.c frobauth-mod.c setauth.c pids.c nonsugid.c \
@@ -36,7 +36,6 @@ HURDLIBS = ps ihash store fshelp ports threads ftpconn shouldbeinlibc
 login-LDLIBS = -lutil $(LIBCRYPT)
 addauth-LDLIBS = $(LIBCRYPT)
 setauth-LDLIBS = $(LIBCRYPT)
-su-LDLIBS = $(LIBCRYPT)
 
 ping-CPPFLAGS = -I$(srcdir)/../pfinet/
 
@@ -50,10 +49,10 @@ INSTALL-ping-ops = -o root -m 4755
 
 include ../Makeconf
 
-freeauth ps addauth rmauth setauth su unsu msgport: parse.o pids.o
-login addauth setauth su: nonsugid.o
-freeauth addauth rmauth setauth su unsu: frobauth.o
-rmauth setauth su unsu: frobauth-mod.o
+ps addauth rmauth setauth unsu msgport: parse.o pids.o
+login addauth setauth: nonsugid.o
+addauth rmauth setauth unsu: frobauth.o
+rmauth setauth unsu: frobauth-mod.o
 ps w: psout.o ../libps/libps.a ../libihash/libihash.a
 
 storeinfo storecat storeread: ../libstore/libstore.a
@@ -65,7 +64,7 @@ ping: ../libthreads/libthreads.a
 # work: all libraries that *any* routine in libfshelp uses must be defined.
 settrans: ../libfshelp/libfshelp.a ../libports/libports.a ../libthreads/libthreads.a
 ps w ids settrans syncfs showtrans fsysopts storeinfo login vmstat portinfo \
-  devprobe vminfo addauth freeauth rmauth setauth su unsu ftpcp ftpdir storeread \
+  devprobe vminfo addauth rmauth setauth unsu ftpcp ftpdir storeread \
   storecat msgport mount: \
 	../libshouldbeinlibc/libshouldbeinlibc.a
 
diff --git a/utils/su.c b/utils/su.c
deleted file mode 100644
index 53563fa3..00000000
--- a/utils/su.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SU
-#include "setauth.c"
diff --git a/utils/unsu.c b/utils/unsu.c
index bea4c98a..467cf46f 100644
--- a/utils/unsu.c
+++ b/utils/unsu.c
@@ -1,8 +1,8 @@
 /* Attempt to undo a previous su
 
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,2000 Free Software Foundation, Inc.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+   Written by Miles Bader <miles@gnu.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -35,9 +35,9 @@ const char *argp_program_version = STANDARD_HURD_VERSION (unsu);
 static struct argp_child child_argps[] = {{ &frobauth_no_ugids_argp }, { 0 }};
 
 static char doc[] =
-  "Attempt to undo a previous su"
+  "Attempt to undo a previous setauth --save"
   "\vThis command is convenient, but will only correctly undo a limited"
-  " subset of possible su commands.  It works by simply deleting all"
+  " subset of possible setauth commands.  It works by simply deleting all"
   " current effective ids and the first two available ids, and then"
   " making the first remaining available id the current effective id.";