rpm/bind
SHA256
1
0
Fork 0
forked from pool/bind
Code Pull Requests Activity

Accepting request 614182 from home:nkukreja:branches:network

Browse Source 
- Fix the hostname in ldapdump to be valid (bsc#965748)

OBS-URL: https://build.opensuse.org/request/show/614182
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=242
This commit is contained in:
Navin Kukreja 2018-06-05 09:30:33 +00:00 committed by Git OBS Bridge
parent 34d201c2e7
commit 6e77e065be
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
bind-ldapdump-use-valid-host.patch Normal file
View File

@ -0,0 +1,51 @@
--- a/vendor-files/tools/ldapdump
+++ b/vendor-files/tools/ldapdump
@@ -343,11 +343,11 @@
};
print PIPE "server $server\n" or die "can’t write to $nsupdate pipe: $!";
}
- print STDERR "\t\tupdate add $zone. 1234 NS ldapdump_kill_me\n" if( $DEBUG );
+ print STDERR "\t\tupdate add $zone. 1234 NS ldapdump.kill.me\n" if( $DEBUG );
if( $DONSUPDATE ) {
# create dummy NS record
# sadly this one is needed if we want to change the last NS record
- print PIPE "update add $zone. 1234 NS ldapdump_kill_me\n" or die "can’t write to $nsupdate pipe: $!";
+ print PIPE "update add $zone. 1234 NS ldapdump.kill.me\n" or die "can’t write to $nsupdate pipe: $!";
}
foreach my $e ( @data ) {
next if( $e =~ /^[\s;]/ );
@@ -587,6 +587,7 @@
my $ref = $zone_entry->get_value($rec.'record', asref => 1);
next unless $ref;
foreach my $rr ( @$ref ) {
+ $rdn =~ s/\.$zone\.$//;
my $where = ($rdn eq '@')?("$zone."):("$rdn.$zone");
my $command = "update add $where $ttl $rec $rr\n";
print STDERR "\t\t$command" if($DEBUG);
@@ -596,9 +597,10 @@
}
}
}
- print STDERR "\t\tupdate delete $zone. NS ldapdump_kill_me\n" if($DEBUG);
+ print STDERR "\t\tupdate delete $zone. NS ldapdump.kill.me\n" if($DEBUG);
if( $DONSUPDATE ) {
- print PIPE "update delete $zone. NS ldapdump_kill_me\n" or die "can’t write to $nsupdate pipe: $!";
+ print PIPE "update delete $zone. NS ldapdump.kill.me\n" or die "can’t write to $nsupdate pipe: $!";
+ print PIPE "send\n" or die "can’t write to $nsupdate pipe: $!";
print PIPE "\n\n\n" or die "can’t write to $nsupdate pipe: $!";
close(PIPE) or die "can’t close $nsupdate pipe: status=$?";
}
@@ -688,9 +688,11 @@
my %entries;
my $entry = "";
foreach( my $i=0; $i<@data; $i++ ) {
- if( $data[$i] =~ /^(\S+)\s+(.*)/ ) {
+ if( $data[$i] =~ /^(\S+)\s+(.*)/ && $data[$i] !~ /^\$TTL/ ) {
$entry = $1;
$entries{$1} .= "$2\n";
+ } elsif ($data[$i] =~ /^\$TTL/) {
+ $entries{$entry} .= $data[$i];
} else {
$data[$i] =~ /^\s+(.*)/;
$entries{$entry} .= "\t$1\n";

5
bind.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 5 09:01:52 UTC 2018 - navin.kukreja@suse.com
- Fix the hostname in ldapdump to be valid (bsc#965748)
-------------------------------------------------------------------
Mon May 21 11:57:47 UTC 2018 - scabrero@suse.de

2
bind.spec
View File

@ -79,6 +79,7 @@ Patch52: named-bootconf.diff
Patch53: bind-sdb-ldap.patch
Patch54: bind-CVE-2017-3145.patch
Patch55: bug-4697-Restore-workaround-for-Microsoft-Windows-T.patch
Patch56: bind-ldapdump-use-valid-host.patch
BuildRequires: libcap-devel
BuildRequires: libmysqlclient-devel
BuildRequires: libopenssl-devel
@ -310,6 +311,7 @@ This package provides a module which allows commands to be sent to rndc directly
%patch53
%patch54 -p1
%patch55 -p1
%patch56 -p1
# use the year from source gzip header instead of current one to make reproducible rpms
year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{SOURCE0})