Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49676 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/DnsServer.pm src/DnsZones.pm
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Tue, 05 Aug 2008 08:54:02 -0000
  • Message-id: <20080805085402.5454639C0C@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Tue Aug 5 10:54:01 2008
New Revision: 49676

URL: http://svn.opensuse.org/viewcvs/yast?rev=49676&view=rev
Log:
- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
(FATE #303596).
- 2.17.4


Modified:
trunk/dns-server/VERSION
trunk/dns-server/package/yast2-dns-server.changes
trunk/dns-server/src/DnsServer.pm
trunk/dns-server/src/DnsZones.pm

Modified: trunk/dns-server/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=49676&r1=49675&r2=49676&view=diff
==============================================================================
--- trunk/dns-server/VERSION (original)
+++ trunk/dns-server/VERSION Tue Aug 5 10:54:01 2008
@@ -1 +1 @@
-2.17.3
+2.17.4

Modified: trunk/dns-server/package/yast2-dns-server.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=49676&r1=49675&r2=49676&view=diff
==============================================================================
--- trunk/dns-server/package/yast2-dns-server.changes (original)
+++ trunk/dns-server/package/yast2-dns-server.changes Tue Aug 5 10:54:01 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Aug 5 10:53:13 CEST 2008 - locilka@xxxxxxx
+
+- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
+ (FATE #303596).
+- 2.17.4
+
+-------------------------------------------------------------------
Wed Jul 23 12:33:54 CEST 2008 - locilka@xxxxxxx

- Added support for dynamic updates initiated also out of the

Modified: trunk/dns-server/src/DnsServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=49676&r1=49675&r2=49676&view=diff
==============================================================================
--- trunk/dns-server/src/DnsServer.pm (original)
+++ trunk/dns-server/src/DnsServer.pm Tue Aug 5 10:54:01 2008
@@ -1651,7 +1651,7 @@
%found = (
'objectclass' => [ 'top', 'suseDnsConfiguration' ],
'cn' => [ 'defaultDNS' ],
- 'susedefaultbase' => [ 'ou=DNS,'.$ldap_domain ],
+ 'suseDefaultBase' => [ 'ou=DNS,'.$ldap_domain ],
);
}
else
@@ -1662,7 +1662,7 @@
}

# check if base DN for zones is defined
- my @bases = @{ $found{"susedefaultbase"} || [] };
+ my @bases = @{ $found{"suseDefaultBase"} || [] };
if (@bases == 0)
{
@bases = ("ou=DNS,$ldap_domain");
@@ -1773,7 +1773,7 @@
my %ldap_object = (
'objectclass' => [ 'top', 'suseDnsConfiguration' ],
'cn' => [ 'defaultDNS' ],
- 'susedefaultbase' => [ 'ou=DNS,'.$ldap_domain ],
+ 'suseDefaultBase' => [ 'ou=DNS,'.$ldap_domain ],
);
my %ldap_request = (
"dn" => "cn=defaultDNS,$ldap_config_dn",
@@ -1796,11 +1796,11 @@
my $dns_conf_dn = $keys[0];
%found = %{$found{$dns_conf_dn}};
# check if base DN for zones is defined
- my @bases = @{ $found{"susedefaultbase"} || [] };
+ my @bases = @{ $found{"suseDefaultBase"} || [] };
if (@bases == 0)
{
my %ldap_object = %found;
- $ldap_object{"susedefaultbase"} = ["ou=DNS,$ldap_domain"];
+ $ldap_object{"suseDefaultBase"} = ["ou=DNS,$ldap_domain"];
my %ldap_request = (
"dn" => "$dns_conf_dn",
);

Modified: trunk/dns-server/src/DnsZones.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=49676&r1=49675&r2=49676&view=diff
==============================================================================
--- trunk/dns-server/src/DnsZones.pm (original)
+++ trunk/dns-server/src/DnsZones.pm Tue Aug 5 10:54:01 2008
@@ -471,7 +471,7 @@
my %zonemap = %{$found[0] || {}};

my $serial = $self->UpdateSerial ("");
- my @soa_str_lst = @{$zonemap{"soarecord"}|| ["@ root $serial 3H 1H 1W
1D"]};
+ my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W
1D"]};

my $soa_str = $soa_str_lst[0];
my @soa_lst = split (" ", $soa_str);
@@ -479,7 +479,7 @@
$_ ne ""
} @soa_lst;

- my @rel_lst = @{$zonemap{"relativedomainname"}};
+ my @rel_lst = @{$zonemap{"relativeDomainName"}};

my %soa = (
"expiry" => $soa_lst[5],
@@ -517,7 +517,7 @@
foreach my $record_ref (@found)
{
my %record = %{$record_ref};
- my @rel_dn = @{$record{"relativedomainname"}};
+ my @rel_dn = @{$record{"relativeDomainName"}};
my $rel_dn = $rel_dn[0];

foreach my $rec_type (@all_rec_types)
@@ -571,12 +571,12 @@
my $soa_record = join (" ", @soa_lst);

my %ldap_record = (
- "objectclass" => ["dnszone"],
- "zonename" => [$zone],
- "relativedomainname" => ["@"],
- "dnsttl" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")],
- "dnsclass" => ["IN"],
- "soarecord" => $soa_record,
+ "objectClass" => ["dNSZone"],
+ "zoneName" => [$zone],
+ "relativeDomainName" => ["@"],
+ "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")],
+ "dNSClass" => ["IN"],
+ "sOARecord" => $soa_record,
);

my @current_records = grep {
@@ -613,7 +613,7 @@
else
{
y2milestone ("Modifying existing record");
- delete $ldap_record{"objectclass"}; # objectclass can be changed by
mail-server
+ delete $ldap_record{"objectClass"}; # objectclass can be changed by
mail-server
SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record);
}

@@ -635,7 +635,7 @@
my @found = @{$found_ref};

@found = map {
- my @l = @{$_->{"relativedomainname"}};
+ my @l = @{$_->{"relativeDomainName"}};
$l[0];
} @found;

@@ -651,7 +651,7 @@
foreach my $d (@deleted)
{
y2milestone ("Removing all records regarding $d");
- SCR->Write (".ldap.delete", {"dn" => "relativedomainname=$d,$zone_dn"});
+ SCR->Write (".ldap.delete", {"dn" => "relativeDomainName=$d,$zone_dn"});
}

# write all the other records
@@ -668,11 +668,11 @@
{
my $rec_dn = "relativeDomainName=$r,$zone_dn";
my %ldap_record = (
- "objectclass" => ["dnszone"],
- "zonename" => [$zone],
- "relativedomainname" => [$r],
- "dnsttl" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")],
- "dnsclass" => ["IN"],
+ "objectClass" => ["dNSZone"],
+ "zoneName" => [$zone],
+ "relativeDomainName" => [$r],
+ "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")],
+ "dNSClass" => ["IN"],
);

@current_records = grep {
@@ -751,7 +751,7 @@
my $found = SCR->Read (".ldap.search", \%ldap_query);
my @found = @{$found || []};
@found = map {
- $_->{"zonename"}[0];
+ $_->{"zoneName"}[0];
} @found;
@found = grep {
defined ($_);

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages