From 62022fe71c935c860f84b5826f519cf388fde538 Mon Sep 17 00:00:00 2001 From: "mahlon@martini.nu" Date: Tue, 12 Jan 2016 08:16:33 +0000 Subject: [PATCH] eval optional modules in blocks instead of strings. FossilOrigin-Name: 20f5040a25392e4f124dccafcea60132df79c4aa7989f7b2b9094a1c70e77032 --- shelldap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shelldap b/shelldap index 3522b1a..2f400e6 100755 --- a/shelldap +++ b/shelldap @@ -539,7 +539,7 @@ sub ldap # not installed and Net::LDAP decides it is required. # if ( $conf->{'tls'} || $conf->{'server'} =~ m|ldaps://| ) { - eval 'use IO::Socket::SSL'; + eval { require IO::Socket::SSL; }; die qq{IO::Socket::SSL not installed, but is required for SSL or TLS connections. You may try connecting insecurely, or install the module and try again.\n} if $@; } @@ -581,7 +581,7 @@ You may try connecting insecurely, or install the module and try again.\n} if $@ } } - undef $@; eval 'use Authen::SASL'; + undef $@; eval { require Authen::SASL; }; my ( $sasl, $sasl_conn ); my $has_sasl = ! $@; my $use_sasl = $has_sasl && $conf->{'sasl'}; @@ -2308,7 +2308,7 @@ my $VERSION = '1.3.1'; use Getopt::Long; use YAML::Syck; use Pod::Usage; -eval 'use Term::ReadLine::Gnu'; +eval { require Term::ReadLine::Gnu; }; warn qq{Term::ReadLine::Gnu not installed. Continuing, but shelldap is of limited usefulness without it.\n\n} if $@;