contrib/cap_sasl.pl: fix function redefinitions

apparently sub <name> {} is done at compile time even if inside an if {}

diff --git a/contrib/cap_sasl.pl b/contrib/cap_sasl.pl
index e99e008282a47c34c09ad4efef436a1a053a97e0..dc8b85b65c8c7dc74f6d01682d359124e07aa1a4 100644 (file)
--- a/contrib/cap_sasl.pl
+++ b/contrib/cap_sasl.pl
@@ -314,7 +314,7 @@ if (eval {require Crypt::PK::ECC}) {
                }
        };
 
-       sub cmd_sasl_keygen {
+       Irssi::command_bind("sasl keygen" => sub {
                my ($data, $server, $witem) = @_;
 
                my $print = $server
@@ -378,9 +378,9 @@ if (eval {require Crypt::PK::ECC}) {
                        $print->("SASL: submit your pubkey to $net:");
                        $print->("%P".$cmdchar.$cmd);
                }
-       }
+       });
 
-       sub cmd_sasl_pubkey {
+       Irssi::command_bind("sasl pubkey" => sub {
                my ($data, $server, $witem) = @_;
 
                my $arg = $server ? $server->{tag} : $data;
@@ -419,20 +419,19 @@ if (eval {require Crypt::PK::ECC}) {
                my $pub = encode_base64($pk->export_key_raw("public_compressed"), "");
                Irssi::print("SASL: loaded keyfile '$f'");
                Irssi::print("SASL: your pubkey is $pub");
-       }
+       });
 } else {
-       sub cmd_sasl_keygen {
-               Irssi::print("'/sasl keygen' requires the Perl 'CryptX' module, which could not be loaded.", MSGLEVEL_CLIENTERROR);
-       }
-
-       sub cmd_sasl_pubkey {
-               Irssi::print("'/sasl pubkey' requires the Perl 'CryptX' module, which could not be loaded.", MSGLEVEL_CLIENTERROR);
-       }
+       Irssi::command_bind("sasl keygen" => sub {
+               Irssi::print("SASL: cannot '/sasl keygen' as the Perl 'CryptX' module is missing",
+                                       MSGLEVEL_CLIENTERROR);
+       });
+
+       Irssi::command_bind("sasl pubkey" => sub {
+               Irssi::print("SASL: cannot '/sasl pubkey' as the Perl 'CryptX' module is missing",
+                                       MSGLEVEL_CLIENTERROR);
+       });
 }
 
-Irssi::command_bind('sasl keygen', \&cmd_sasl_keygen);
-Irssi::command_bind('sasl pubkey', \&cmd_sasl_pubkey);
-
 cmd_sasl_load();
 
 # vim: ts=4:sw=4