Merge.

FossilOrigin-Name: 4e683968021d572e5259f3cfb2c63d910d1536ac3ed14669a39503fd6ad26e84

.hgtags

@@ -10,3 +10,4 @@ e1728adb2561a87a3ab10e57ae4b3140abf4b5cf 1.1.0
 1a480ba231b6ef7714a08151434b7773a1851936 1.2.0
 b3b840a4b56c534501ee930a8ca0b2e08ecb43bb v1.3.0
 7b7810fee305fd420e6d1082000c833ca28803ac v1.3.1
+aa4172c204d411c4f5693f2b12b472ea0a18cfd1 v1.3.2

CHANGELOG

@@ -0,0 +1,157 @@
+2016-01-12  v1.3.2
+
+	* Don't test for optional perl modules by string eval().
+
+	* Migration to BitBucket for issue tracking and downloads.
+	  Primary repository is still (and will continue to be) martini.nu.
+
+	* Fix anonymous binds when SASL is not used.
+
+	* Allow the period character when moving an entry by DN.
+
+	* Allow editor arguments in your .shelldap.rc or EDITOR environment
+	  variable when editing files externally.
+
+
+2015-03-04  v1.3.1
+
+	* Use the system definied tempdir instead of hardcoding /tmp.
+
+
+2014-12-04  v1.3.0
+
+	* Add a 'less' command, that does the same as cat, but uses a pager.
+
+
+2014-08-11  v.1.2.0
+
+	* Disable LDIF line wrapping when writing -to- temporary files.
+
+	* Add 'rm' for a fully qualified DN, instead of only working with RDN.
+
+
+2014-06-23  v1.1.1
+
+	* Fix pod documentation so it can build without complaint under perl 5.20.
+
+
+2014-06-21  v.1.1.0
+
+	* Add CONTRIBUTORS file.
+	
+	* Add simple (optional) SASL support.
+
+	* Fix the DN regexp to include dashes.
+
+
+2013-05-15  v1.0.2
+
+	* Automatically use ldif syntax highlighting for editors that understand LDIF.
+
+	* Catch a case where the LDAP object is defined, but in a state that
+	  schema/root_dse are not obtainable. Add the connected server to
+	  'id/whoami' output.
+
+	* Fix another LCS edge case.
+
+
+2013-04-18  v1.0.1
+
+	* Fix for edge case Diff::LCS traversals. 
+	* Ensure re-edit state is cleared in between attempts.
+
+
+2013-03-19  v1.0.0
+
+	* Add the "inspect" command, which provides some quick reference for
+	  server schema objectClasses and attributes.
+
+	* Add a command line option (-f) to specify an alternate configuration file.
+
+	* Allow setting the $editor from the config file.
+
+	* Offer to re-enter the editor if there is an error during create or
+	  edit, so changes aren't lost.
+
+	* Change the version number to reflect semantic versioning (http://semver.org).
+
+	* Alter the default wrap width for LDIF to expand to the terminal
+	  size, with an optional rc file override.
+
+	* More robust path for connection retries. Show optional, unused
+	  attributes as comments in the editor.
+
+
+2013-01-08  v0.7
+
+	* Attempt to retry the operation on failure.
+
+	* Add a flag to force a password prompt, so you can override
+	  credentials from your cached shelldap.rc.
+
+	* Make the behaviour of cd, edit and mkdir similar to cat and
+	  delete/rm and fail if some RDN's in the argument contain spaces
+	  without beeing quoted.
+
+
+2011-09-06  v0.5
+
+	* Backout the additional objectClasses patch for mkdir: same behavior
+	  can be acheived with 'touch', less complex to leave it as is.
+
+	* Add a --version flag.
+
+	* Add better verbosity when saving connection cache data.
+
+	* Make sure the hasSubordinates attribute is defined before checking its value.
+
+	* Fix 'ls -R' output.
+
+	* Repair broken path behavior, remove unneeded #path_to_dn 'relative' flag.
+
+	* Add method path_to_dn() to convert a given "path" to a DN
+
+	* mkdir: support more objectclasses
+
+	* make_filter: cope with filters that are already parenthesized
+
+	* cd: flexible treatment of repeated '..', even as prefix
+
+	* base(): make more secure, allow '' as DN
+
+	* Added documentation for the additional short flags.
+
+	* Accept short option names for some options
+
+	* use symbolic LDAP error codes instead of numbers
+
+	* Exit with a nicer error message if IO::Socket::SSL isn't installed.
+
+	* Allow '-' on RDN name when copying
+
+
+2011-02-17  v0.4
+
+	* Follow regular man page conventions.
+
+	* Improve performance for cd/ls for containers with a large number of entries.
+
+
+2011-02-17  v0.3
+
+	* Update documentation, now that multiline edits work. Minor other cleanups.
+
+	* Combine multiple lines into a single one before displaying LDIF.
+
+	* Append a trailing slash to entries that contain other entries.
+
+	* Add options to support ssl key verification when connecting with TLS.
+
+	* Display correct configuration file in error message, if a YAML parse error occurrs.
+
+
+2008-12-04  v0.2
+
+	* Start using a repository.  :-)
+
+

CONTRIBUTORS

@@ -7,7 +7,7 @@ Gertjan Halkes <shelldap@ghalkes.nl>
 Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
 Jonathan Rozes <jonathan@laika.com>
 Josef Wells <Josefwells@alumni.utexas.net>
-Landry Breuil <landry@cvs.openbsd.org>
+Landry Breuil <landry@openbsd.org>
 Lars Täuber <taeuber@bbaw.de>
 Michael Granger <ged@faeriemud.org>
 Michael Raitza <spacefrogg-devel@meterriblecrew.net>

Makefile

@@ -4,7 +4,6 @@ VERSION := $(shell awk '/VERSION =/ { print $$4 }' shelldap | sed -e "s/[';]//g"
 release:
 	@mkdir shelldap-${VERSION}
 	@cp shelldap shelldap-${VERSION}
-	@hg log --style=changelog > shelldap-${VERSION}/ChangeLog
+	@pod2text shelldap > shelldap-${VERSION}/USAGE
-	@pod2text shelldap > shelldap-${VERSION}/README
 	@tar -czvf shelldap-${VERSION}.tar.gz shelldap-${VERSION}
 	@rm -rf shelldap-${VERSION}

README.md

@@ -78,6 +78,7 @@ Additional functionality is supported with the presence of:
 
 * IO::Socket::SSL
 * Authen::SASL
+* Term::ReadLine::Gnu
 
 
 Development

shelldap

@@ -2408,6 +2408,7 @@ if ( $conf->{'configfile'} ) {
 	while ( my ($k, $v) = each %{$conf} ) { $conf->{ $k } = $v }
 }
 
+
 # defaults
 $conf->{'configfile'} ||= "$ENV{'HOME'}/.shelldap.rc";
 $conf->{'cacheage'} ||= 300;