From 830a5033c2c90a6c2756caf032c4a5d888024470 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 9 Feb 2018 11:08:31 +0100 Subject: [PATCH] UserConfig: remove useless eval Signed-off-by: Wolfgang Bumiller --- PMG/UserConfig.pm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/PMG/UserConfig.pm b/PMG/UserConfig.pm index 8ccb8f5..0b9a73d 100644 --- a/PMG/UserConfig.pm +++ b/PMG/UserConfig.pm @@ -241,19 +241,13 @@ sub write_user_conf { $d->{userid} = $userid; die "invalid userid '$userid'\n" if $userid eq 'root@pmg'; + $verity_entry->($d); + $cfg->{$d->{userid}} = $d; - eval { - $verity_entry->($d); - $cfg->{$d->{userid}} = $d; - - if ($d->{userid} ne 'root@pam') { - die "role 'root' is reserved\n" if $d->{role} eq 'root'; - die "unable to add users for realm '$d->{realm}'\n" - if $d->{realm} && $d->{realm} ne 'pmg'; - } - }; - if (my $err = $@) { - die $err; + if ($d->{userid} ne 'root@pam') { + die "role 'root' is reserved\n" if $d->{role} eq 'root'; + die "unable to add users for realm '$d->{realm}'\n" + if $d->{realm} && $d->{realm} ne 'pmg'; } my $line; -- 2.39.2