Branch merge.

FossilOrigin-Name: 314b9504a2bca796e18278fecbe12a6bc55d7ace9bfa4d06b0f9217d627af271
This commit is contained in:
mahlon@laika.com 2014-08-11 18:25:33 +00:00
commit d6d0a5f8b0
2 changed files with 5 additions and 1 deletions

View file

@ -6,4 +6,5 @@
27bbe75233a3da1482fededd7f67215bc716b2d5 1.0.0 27bbe75233a3da1482fededd7f67215bc716b2d5 1.0.0
0cc20d93ff50438fcb3fec864474b3cab492dd1a 1.0.1 0cc20d93ff50438fcb3fec864474b3cab492dd1a 1.0.1
94b64bbf93cfdfaf0ee68c54cd60bd85865fcb47 1.0.2 94b64bbf93cfdfaf0ee68c54cd60bd85865fcb47 1.0.2
e1728adb2561a87a3ab10e57ae4b3140abf4b5cf 1.1.0
1a480ba231b6ef7714a08151434b7773a1851936 1.2.0 1a480ba231b6ef7714a08151434b7773a1851936 1.2.0

View file

@ -145,6 +145,8 @@ credentials.
=back =back
=over 4
=item B<sasl> =item B<sasl>
A space separated list of SASL mechanisms. Requires the Authen::SASL A space separated list of SASL mechanisms. Requires the Authen::SASL
@ -655,7 +657,7 @@ sub ldif
if ( $use_temp ) { if ( $use_temp ) {
my ( undef, $fname ) = my ( undef, $fname ) =
File::Temp::tempfile( 'shelldap_XXXXXXXX', SUFFIX => '.ldif', DIR => '/tmp', UNLINK => 1 ); File::Temp::tempfile( 'shelldap_XXXXXXXX', SUFFIX => '.ldif', DIR => '/tmp', UNLINK => 1 );
$self->{'ldif'} = Net::LDAP::LDIF->new( $fname, 'w', sort => 1, wrap => 0 ) $self->{'ldif'} = Net::LDAP::LDIF->new( $fname, 'w', sort => 1, wrap => 0 );
$self->{'ldif_fname'} = $fname; $self->{'ldif_fname'} = $fname;
} }
@ -1587,6 +1589,7 @@ sub run_edit
} }
close LDIF; close LDIF;
} }
# checksum it, then open it in an editor # checksum it, then open it in an editor
# #
my $hash_orig = $self->chksum( $self->{'ldif_fname'} ); my $hash_orig = $self->chksum( $self->{'ldif_fname'} );