mahlon/shelldap
1
0
Fork 0
Code Issues Pull requests Activity

Exit with a nicer error message if IO::Socket::SSL isn't installed,

Browse source 
but the user is requesting SSL/TLS.  (this is normally required by
Net::LDAP.)

FossilOrigin-Name: ae25e363ef83020513510190bab0c2c75b879b4afae7cf2ef304d171f7c3bb0e
This commit is contained in:
Mahlon E. Smith 2011-09-06 22:59:04 +00:00
parent 9f46d5d326
commit 778926d3c5
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
shelldap
View file

@ -444,6 +444,16 @@ sub ldap
# fill in potentially missing info # fill in potentially missing info
die "No server specified.\n" unless $conf->{'server'}; die "No server specified.\n" unless $conf->{'server'};
# Emit a nicer error message if IO::Socket::SSL is
# not installed and Net::LDAP decides it is required.
#
if ( $conf->{'tls'} || $conf->{'server'} =~ m|ldaps://| ) {
eval 'use 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 $@;
}
if ( $conf->{'binddn'} && ! $conf->{'bindpass'} ) { if ( $conf->{'binddn'} && ! $conf->{'bindpass'} ) {
print "Bind password: "; print "Bind password: ";
Term::ReadKey::ReadMode 2; Term::ReadKey::ReadMode 2;
@ -457,7 +467,8 @@ sub ldap
or die "Unable to connect to LDAP server '$conf->{'server'}': $!\n"; or die "Unable to connect to LDAP server '$conf->{'server'}': $!\n";
# secure connection options # secure connection options
if ( $conf->{'tls'} ) { #
if ( $conf->{'tls'} ) {
if ( $conf->{'tls_key'} ) { if ( $conf->{'tls_key'} ) {
$ldap->start_tls( $ldap->start_tls(
verify => 'require', verify => 'require',
@ -494,7 +505,7 @@ sub ldap
my $err = $rv->error(); my $err = $rv->error();
if ( $rv->code() ) { if ( $rv->code() ) {
$err .= " (forgot the --tls flag?)" $err .= " (try the --tls flag?)"
if $err =~ /confidentiality required/i; if $err =~ /confidentiality required/i;
die "LDAP bind error: $err\n"; die "LDAP bind error: $err\n";
} }
@ -503,6 +514,7 @@ sub ldap
# if we enter this conditional, we have successfully # if we enter this conditional, we have successfully
# authed with the server (non anonymous), and # authed with the server (non anonymous), and
# we haven't cached anything in the past. # we haven't cached anything in the past.
#
if ( $conf->{'binddn'} && ! -e $conf->{'confpath'} ) { if ( $conf->{'binddn'} && ! -e $conf->{'confpath'} ) {
print "Would you like to cache your connection information? [Y/n]: "; print "Would you like to cache your connection information? [Y/n]: ";
chomp( my $response = <STDIN> ); chomp( my $response = <STDIN> );