From 42144158c9036f4801289905a316de4a2b7a772e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 18 Dec 2009 11:15:39 -0800 Subject: User deletion update 1. Allow deleting user still logged in (Bug 5067) 2. Don't allow deleting self, because that would mean killing current process. --- lib/Vyatta/Login/User.pm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/Vyatta/Login/User.pm') diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm index 5280a4a1..b0c0381c 100755 --- a/lib/Vyatta/Login/User.pm +++ b/lib/Vyatta/Login/User.pm @@ -167,7 +167,12 @@ sub update { warn "Disabling root account, instead of deleting\n"; system ('sudo usermod -p ! root') == 0 or die "usermod of root failed: $?\n"; + } elsif (getlogin() eq $user) { + die "Attempting to delete current user: $user\n"; } else { + # This logs out user + system("sudo pkill -u $user"); + system("sudo userdel -r '$user'") == 0 or die "userdel of $user failed: $?\n"; } -- cgit v1.2.3