diff --git a/bind.changes b/bind.changes index 15fc182..484cf9e 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 31 09:36:54 UTC 2011 - rhafer@suse.de + +- Fixed the ldapdump tool to also respect the "uri" setting in + /etc/openldap/ldap.conf (bnc#710430) + ------------------------------------------------------------------- Tue Jul 5 15:24:10 CEST 2011 - ug@suse.de diff --git a/bind.spec b/bind.spec index 7157d18..d8eb1ab 100644 --- a/bind.spec +++ b/bind.spec @@ -46,6 +46,7 @@ Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff Patch5: tmpfs.patch +Patch6: ldapdump-allow-uri.diff Patch51: pie_compile.diff Patch52: named-bootconf.diff Patch54: named-direct-proc-mount.diff @@ -225,6 +226,7 @@ Authors: %patch2 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p1 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 diff --git a/ldapdump-allow-uri.diff b/ldapdump-allow-uri.diff new file mode 100644 index 0000000..edc62f9 --- /dev/null +++ b/ldapdump-allow-uri.diff @@ -0,0 +1,12 @@ +Index: bind-9.6-ESVR4P3/vendor-files/tools/ldapdump +=================================================================== +--- bind-9.6-ESVR4P3.orig/vendor-files/tools/ldapdump ++++ bind-9.6-ESVR4P3/vendor-files/tools/ldapdump +@@ -622,6 +622,7 @@ sub getLDAPConfigServer { + my $data; + open( FILE, "< /etc/openldap/ldap.conf" ) or die "unable to open /etc/openldap/ldap.conf. $!"; + while() { ++ if ( /^uri\s+([^\s]*)\s*/i ) { $data = $1; last } + if ( /^host\s+([^\s]*)\s*/i ) { $data = $1; last } + } + close(FILE);