Once again, /usr/sbin/smrsh -> /usr/libexec

Correct paths in smrsh(8).

diff --git a/gnu/usr.sbin/sendmail/smrsh/Makefile b/gnu/usr.sbin/sendmail/smrsh/Makefile
index 7183a9c..01ebf94 100644 (file)
--- a/gnu/usr.sbin/sendmail/smrsh/Makefile
+++ b/gnu/usr.sbin/sendmail/smrsh/Makefile
@@ -1,8 +1,9 @@
-#      $OpenBSD: Makefile,v 1.2 2000/04/02 19:48:36 millert Exp $
+#      $OpenBSD: Makefile,v 1.3 2000/04/11 07:31:32 form Exp $
 
 PROG=  smrsh
 MAN=   smrsh.8
 ENVDEF+=-DNOT_SENDMAIL -DCMDDIR=\"/usr/libexec/sm.bin\"
+BINDIR=        /usr/libexec
 
 WANT_LIBSMUTIL=1
 

diff --git a/gnu/usr.sbin/sendmail/smrsh/smrsh.8 b/gnu/usr.sbin/sendmail/smrsh/smrsh.8
index 968b135..ce13f81 100644 (file)
--- a/gnu/usr.sbin/sendmail/smrsh/smrsh.8
+++ b/gnu/usr.sbin/sendmail/smrsh/smrsh.8
@@ -10,6 +10,7 @@
 .\"
 .\"
 .\"     $Sendmail: smrsh.8,v 8.11 1999/06/09 16:51:07 ca Exp $
+.\"    $OpenBSD: smrsh.8,v 1.2 2000/04/11 07:31:32 form Exp $
 .\"
 .TH SMRSH 8 11/02/93
 .SH NAME
@@ -38,7 +39,7 @@ limits the set of programs that he or she can execute.
 Briefly,
 .I smrsh
 limits programs to be in the directory
-/usr/adm/sm.bin,
+/usr/libexec/sm.bin,
 allowing the system administrator to choose the set of acceptable commands,
 and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
 It also rejects any commands with the characters
@@ -55,10 +56,10 @@ so forwarding to ``/usr/ucb/vacation'',
 and
 ``vacation''
 all actually forward to
-``/usr/adm/sm.bin/vacation''.
+``/usr/libexec/sm.bin/vacation''.
 .PP
 System administrators should be conservative about populating
-/usr/adm/sm.bin.
+/usr/libexec/sm.bin.
 Reasonable additions are
 .IR vacation (1),
 .IR procmail (1),
@@ -77,11 +78,11 @@ it simply disallows execution of arbitrary programs.
 Compilation should be trivial on most systems.
 You may need to use \-DPATH=\e"\fIpath\fP\e"
 to adjust the default search path
-(defaults to ``/bin:/usr/bin:/usr/ucb'')
+(defaults to ``/bin:/usr/bin'')
 and/or \-DCMDBIN=\e"\fIdir\fP\e"
 to change the default program directory
-(defaults to ``/usr/adm/sm.bin'').
+(defaults to ``/usr/libexec/sm.bin'').
 .SH FILES
-/usr/adm/sm.bin \- directory for restricted programs
+/usr/libexec/sm.bin \- directory for restricted programs
 .SH SEE ALSO
 sendmail(8)