From d49664ea31da4c2d59f851397d2f51d857c54f00 Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Wed, 30 May 2018 13:41:25 -0400 Subject: [PATCH 1/3] Add WARNING message if non-root user runs chtab command --- xCAT-server/sbin/chtab | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xCAT-server/sbin/chtab b/xCAT-server/sbin/chtab index e6a6d0a99..715734cde 100755 --- a/xCAT-server/sbin/chtab +++ b/xCAT-server/sbin/chtab @@ -63,6 +63,12 @@ unless ($target) { exit(1); } +my $current_userid = getpwuid($>); +if ($current_userid ne "root") +{ + print "WARNING: chtab worked without passing xcatd, using tabch command instead if user is controled by policy mechanism\n"; +} + my %keyhash = (); my @keypairs = split(/,/, $target); if ($keypairs[0] !~ /([^\.\=]+)\.([^\.\=]+)\=(.+)/) { From bcf0b4a7b818506a842b111c5c5e7b852f443ad8 Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Wed, 30 May 2018 21:27:00 -0400 Subject: [PATCH 2/3] Modified message --- xCAT-server/sbin/chtab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/sbin/chtab b/xCAT-server/sbin/chtab index 715734cde..7859ce463 100755 --- a/xCAT-server/sbin/chtab +++ b/xCAT-server/sbin/chtab @@ -66,7 +66,7 @@ unless ($target) { my $current_userid = getpwuid($>); if ($current_userid ne "root") { - print "WARNING: chtab worked without passing xcatd, using tabch command instead if user is controled by policy mechanism\n"; + print "WARNING: chtab bypasses xcatd and does not enforce xCAT policy tables. Using tabch instead.\n"; } my %keyhash = (); From adb1cafa43df68d70912e63f47fe1cc1f6bad9fe Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Fri, 1 Jun 2018 11:28:25 -0400 Subject: [PATCH 3/3] modify message --- xCAT-server/sbin/chtab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/sbin/chtab b/xCAT-server/sbin/chtab index 7859ce463..9a2bff905 100755 --- a/xCAT-server/sbin/chtab +++ b/xCAT-server/sbin/chtab @@ -66,7 +66,7 @@ unless ($target) { my $current_userid = getpwuid($>); if ($current_userid ne "root") { - print "WARNING: chtab bypasses xcatd and does not enforce xCAT policy tables. Using tabch instead.\n"; + print "WARNING: chtab bypasses xcatd and does not enforce xCAT policy tables. Consider using tabch instead.\n"; } my %keyhash = ();