From 226228c574853010182b3f3ec7570e0fd6136cee Mon Sep 17 00:00:00 2001 From: bapt Date: Tue, 10 Nov 2015 07:17:38 +0000 Subject: [PATCH] MFC r290480 Protecting against rm -rf / is now POSIXLY_CORRECT per posix 1003.1 edition 2013. No need anymore to disable the protection if one set the POXILY_CORRECT environment variable. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D4092 git-svn-id: svn://svn.freebsd.org/base/stable/10@290634 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/rm/rm.1 | 4 ++-- bin/rm/rm.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 824b627de..a0e775432 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd April 25, 2013 +.Dd November 7, 2015 .Dt RM 1 .Os .Sh NAME @@ -235,7 +235,7 @@ not the standard error output. The .Nm command conforms to -.St -p1003.2 . +.St -p1003.1-2013 . .Pp The simplified .Nm unlink diff --git a/bin/rm/rm.c b/bin/rm/rm.c index d91af54a5..7beae2d62 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -155,8 +155,7 @@ main(int argc, char *argv[]) } checkdot(argv); - if (getenv("POSIXLY_CORRECT") == NULL) - checkslash(argv); + checkslash(argv); uid = geteuid(); (void)signal(SIGINFO, siginfo); -- 2.45.0