From a7bf4d2a6c9677767939ccd6ae05b12be987f38f Mon Sep 17 00:00:00 2001 From: Romain Dessort Date: Wed, 31 Jul 2013 10:27:59 +0000 Subject: [PATCH] Fix some bugs: - check the success of ldapadd with an incorrect variable name - unknown LDAP attributes added with add-mail-virtual.pl --- scripts/add-mail-unix.pl | 2 +- scripts/add-mail-virtual.pl | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/add-mail-unix.pl b/scripts/add-mail-unix.pl index d0991fb..ceed030 100755 --- a/scripts/add-mail-unix.pl +++ b/scripts/add-mail-unix.pl @@ -128,7 +128,7 @@ sub add() ] ) or die "heh : $!"; - $mesg->code && die $mesg->error; + $result->code && die $result->error; $ldap->unbind; # $HOME diff --git a/scripts/add-mail-virtual.pl b/scripts/add-mail-virtual.pl index b273253..306e626 100755 --- a/scripts/add-mail-virtual.pl +++ b/scripts/add-mail-virtual.pl @@ -141,12 +141,10 @@ sub add() 'webmailActive' => 'TRUE', 'authsmtpActive' => 'FALSE', 'homeDirectory' => "/home/vmail/$domain/$login/", - 'amavisSpamTagLevel' => '-1999.0', - 'amavisSpamTag2Level' => '6.3' ] ); - $mesg->code && die $mesg->error; + $result->code && die $result->error; $ldap->unbind; # HOMEDIR (obsolete ?)