From 9e01a4a51e652e03e8394bab26c0944dbea1467d Mon Sep 17 00:00:00 2001 From: "mahlon@martini.nu" Date: Mon, 15 Apr 2019 21:16:09 +0000 Subject: [PATCH] Add LICENSE file for packaging, bump copyright. FossilOrigin-Name: 402bf6ec5541677dc298f5b9301eaa889c2f687a972b11fd95843c95d09a8363 --- LICENSE | 28 ++++++++++++++++++++++++++++ shelldap | 8 +++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100755 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..42d1a4d --- /dev/null +++ b/LICENSE @@ -0,0 +1,28 @@ + +Copyright (c) 2006-2019, Mahlon E. Smith +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of Mahlon E. Smith nor the names of his + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/shelldap b/shelldap index 948a2ca..296c9ac 100755 --- a/shelldap +++ b/shelldap @@ -1,7 +1,7 @@ #!/usr/bin/env perl # vim: set nosta noet ts=4 sw=4: # -# Copyright (c) 2006-2015, Mahlon E. Smith +# Copyright (c) 2006-2019, Mahlon E. Smith # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -686,19 +686,21 @@ sub ldif my $self = shift; my $use_temp = shift; + my $raw = qr/(^jpegPhoto|;binary)/; + # create tmpfile and link ldif object with it # if ( $use_temp ) { my ( undef, $fname ) = File::Temp::tempfile( 'shelldap_XXXXXXXX', SUFFIX => '.ldif', TMPDIR => 1, 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, raw => $raw ); $self->{'ldif_fname'} = $fname; } # ldif -> stdout # else { - $self->{'ldif'} = Net::LDAP::LDIF->new( \*STDOUT, 'w', sort => 1, wrap => $self->wrapsize ); + $self->{'ldif'} = Net::LDAP::LDIF->new( \*STDOUT, 'w', sort => 1, wrap => $self->wrapsize, raw => $raw ); } return $self->{'ldif'};