From 74ae8c9cdbbd318c928e57288b60396affb9cf9a Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Wed, 17 Mar 2010 14:13:25 -0700 Subject: fixes commit warning when run invoked via the api--getlogin() may return an undefined value as the process is a child process invoked indirectly via the gui (not a normal shell logged in user generated event). --- lib/Vyatta/Login/User.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm index afc3cf53..419a882d 100755 --- a/lib/Vyatta/Login/User.pm +++ b/lib/Vyatta/Login/User.pm @@ -102,11 +102,12 @@ sub _authorized_keys { sub _delete_user { my $user = shift; + my $login = getlogin(); if ( $user eq 'root' ) { warn "Disabling root account, instead of deleting\n"; system('usermod -p ! root') == 0 or die "usermod of root failed: $?\n"; - } elsif ( getlogin() eq $user ) { + } elsif ( defined($login) && $login eq $user ) { die "Attempting to delete current user: $user\n"; } else { if (`who | grep "^$user"` ne '') { -- cgit v1.2.3