Accepting request 80345 from home:rhafer:branches:network

bnc#710430

OBS-URL: https://build.opensuse.org/request/show/80345
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=60
This commit is contained in:
Ralf Haferkamp 2011-09-01 09:58:02 +00:00 committed by Git OBS Bridge
parent c61a563321
commit 184ce3adff
3 changed files with 20 additions and 0 deletions

View File

@ -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

View File

@ -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

12
ldapdump-allow-uri.diff Normal file
View File

@ -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(<FILE>) {
+ if ( /^uri\s+([^\s]*)\s*/i ) { $data = $1; last }
if ( /^host\s+([^\s]*)\s*/i ) { $data = $1; last }
}
close(FILE);