[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-directory-commits
Subject: [389-commits] 2 commits - ldap/admin Makefile.am Makefile.in
From: Richard Allen Megginson <rmeggins () fedoraproject ! org>
Date: 2011-05-23 17:49:32
Message-ID: 20110523174932.0DB081200F9 () lists ! fedorahosted ! org
[Download RAW message or body]
Makefile.am | 1
Makefile.in | 1
ldap/admin/src/scripts/50fixNsState.pl | 176 ++++++++++++++++++++++++++++
ldap/admin/src/scripts/70upgradefromldif.pl | 4
ldap/admin/src/scripts/setup-ds.res.in | 3
5 files changed, 182 insertions(+), 3 deletions(-)
New commits:
commit c244f868db6ba086228bf8afd71aedbb2237eafd
Author: Rich Megginson <rmeggins@redhat.com>
Date: Thu May 19 16:17:27 2011 -0600
Bug 703990 - Support upgrade from Red Hat Directory Server
https://bugzilla.redhat.com/show_bug.cgi?id=703990
Resolves: bug 703990
Bug Description: Support upgrade from Red Hat Directory Server
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: Couple of bugs with a previous patch
1) offline import did not work because the import function did not get
the instdir location of ldif2db
2) spelling error in error message
Platforms tested: RHEL6 x86_64 (from RHEL 5 32-bit and 64-bit)
Flag Day: no
Doc impact: yes
diff --git a/ldap/admin/src/scripts/70upgradefromldif.pl \
b/ldap/admin/src/scripts/70upgradefromldif.pl index a6ec644..e8b968d 100644
--- a/ldap/admin/src/scripts/70upgradefromldif.pl
+++ b/ldap/admin/src/scripts/70upgradefromldif.pl
@@ -85,7 +85,7 @@ sub startTaskAndWait {
}
sub importLDIF {
- my ($conn, $file, $be, $isrunning, $rc) = @_;
+ my ($conn, $file, $be, $isrunning, $instdir, $rc) = @_;
if ($isrunning) {
my $cn = "import" . time;
@@ -104,7 +104,7 @@ sub importLDIF {
$? = 0; # clear
if ($rc = system("$instdir/ldif2db -n $be -i $file > /dev/null 2>&1")) {
debug(0, "Could not import $file to database $be - check errors log\n");
- return ('error_import_check_log', $file, $be, $rc);
+ return ('error_import_check_log', $file, $be, $?);
}
}
diff --git a/ldap/admin/src/scripts/setup-ds.res.in \
b/ldap/admin/src/scripts/setup-ds.res.in index 674b4af..4c4c797 100644
--- a/ldap/admin/src/scripts/setup-ds.res.in
+++ b/ldap/admin/src/scripts/setup-ds.res.in
@@ -200,5 +200,5 @@ Please check the spelling of the hostname and/or your network \
configuration.\ If you proceed with this hostname, you may encounter problems.\
\
Do you want to proceed with hostname '%s'?
-error_import_check_log = Error: unable to import file '%s' for backend '%s' - %s. \
Check the errrors log for additional information\n +error_import_check_log = Error: \
unable to import file '%s' for backend '%s' - %s. Check the errors log for \
additional information\n error_could_not_parse_nsstate = Error: could not parse \
nsState from %s. Value: %s\n
commit c4d9f45af88ba0f7c34f202d216ff9e95799be6d
Author: Rich Megginson <rmeggins@redhat.com>
Date: Wed May 18 13:43:18 2011 -0600
Bug 703990 - Support upgrade from Red Hat Directory Server
https://bugzilla.redhat.com/show_bug.cgi?id=703990
Resolves: bug 703990
Bug Description: Support upgrade from Red Hat Directory Server
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: added 50fixNsState.pl - if upgrading from a machine of
a different arch, we need to fix the nsState attribute value used by the
uniqueid generator and the CSN generator. If upgrading from a 32-bit to
a 64-bit, we cannot update the uniqueid generator due to a bug in the
generator code, so we just delete the entry and let the server
recreate it.
Platforms tested: RHEL6 x86_64 (from RHEL 5 32-bit and 64-bit)
Flag Day: no
Doc impact: yes
diff --git a/Makefile.am b/Makefile.am
index b22d003..39b49c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -461,6 +461,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
ldap/admin/src/scripts/50faxnumbersyntaxplugin.ldif \
ldap/admin/src/scripts/50teletexterminalidsyntaxplugin.ldif \
ldap/admin/src/scripts/50faxsyntaxplugin.ldif \
+ ldap/admin/src/scripts/50fixNsState.pl \
ldap/admin/src/scripts/50telexnumbersyntaxplugin.ldif \
ldap/admin/src/scripts/50guidesyntaxplugin.ldif \
ldap/ldif/50replication-plugins.ldif \
diff --git a/Makefile.in b/Makefile.in
index c6e9742..a117b0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1650,6 +1650,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
ldap/admin/src/scripts/50faxnumbersyntaxplugin.ldif \
ldap/admin/src/scripts/50teletexterminalidsyntaxplugin.ldif \
ldap/admin/src/scripts/50faxsyntaxplugin.ldif \
+ ldap/admin/src/scripts/50fixNsState.pl \
ldap/admin/src/scripts/50telexnumbersyntaxplugin.ldif \
ldap/admin/src/scripts/50guidesyntaxplugin.ldif \
ldap/ldif/50replication-plugins.ldif \
diff --git a/ldap/admin/src/scripts/50fixNsState.pl \
b/ldap/admin/src/scripts/50fixNsState.pl new file mode 100644
index 0000000..e60aef6
--- /dev/null
+++ b/ldap/admin/src/scripts/50fixNsState.pl
@@ -0,0 +1,176 @@
+use Mozilla::LDAP::Conn;
+use Mozilla::LDAP::Entry;
+use Mozilla::LDAP::Utils qw(normalizeDN);
+use Mozilla::LDAP::API qw(:constant ldap_url_parse ldap_explode_dn);
+use DSUtil qw(debug);
+use Config;
+
+# # Determine the endianness of your system
+my $packfmt32 = "QA6SCx3"; # must be 20 bytes
+my $packfmt64 = "QA6SCx7"; # must be 24 bytes
+
+my $is_big_endian = unpack('xc', pack('s', 1));
+# see if we are on an LP64 system
+my $is64 = ($Config{longsize} == 8);
+
+sub convert_uniqueid {
+ my $ent = shift;
+ my $val = shift;
+
+ if (!$ent || !$val) {
+ return (0, 0);
+ }
+
+ my $hex = unpack('H*', $val);
+ #print "hex=$hex\n";
+
+ my $fmt32 = "QA6SC";
+ my $fmt64 = "QA6SC";
+ my $fmt = $fmt32;
+ if (length($val) > 20) {
+ $fmt = $fmt64;
+ } elsif ($is64) {
+ # cannot convert 32-bit to 64-bit - just delete the entry and continue
+ debug(1, "Cannot convert 32-bit nsState value $hex to 64-bit - deleting \
entry " . + $ent->getDN() . " and continuing\n");
+ return (-1, 0);
+ }
+ if ($is_big_endian) {
+ $packfmt32 = "(QA6SCx3)>";
+ $packfmt64 = "(QA6SCx7)>";
+ }
+
+ my $packfmt = $packfmt32;
+ if ($is64) {
+ $packfmt = $packfmt64;
+ }
+
+ my ($ts, $node, $clockseq, $last_update) = unpack($fmt, $val);
+ # if we think it is from bigendian, do
+ # $bigfmt = "(" . $fmt . ")>";
+ my $tssecs = ($ts - 0x01B21DD213814000) / 10000000;
+ my $curts = time;
+ my $tsdiff = abs($curts - $tssecs);
+ my $maxdiff = 86400*365*10; # 10 years
+ if (($tsdiff > $maxdiff) || (($last_update != 0) && ($last_update != 1))) {
+ # try big endian
+ ($ts, $node, $clockseq, $last_update) = unpack("($fmt)>", $val);
+ $tssecs = ($ts - 0x01B21DD213814000) / 10000000;
+ $tsdiff = abs($curts - $tssecs);
+ if (($tsdiff > $maxdiff) || (($last_update != 0) && ($last_update != 1))) {
+ debug(0, "Error: could not parse nsstate $hex - tsdiff is $tsdiff \
seconds or ", ($tsdiff/86400), " days\n"); + return (0, 0, \
'error_could_not_parse_nsstate', $ent->getDN(), $hex); + }
+ }
+
+ # format for the target system
+ my $newval = pack($packfmt, $ts, $node, $clockseq, $last_update);
+ my $rc = 0;
+ if ($val != $newval) { # changed
+ my $hex2 = unpack('H*', $newval);
+ debug(1, "Converted old nsState val in ", $ent->getDN(), " from $hex to \
$hex2\n"); + $rc = 1; # changed
+ }
+ return ($rc, $newval);
+}
+
+sub convert_replica {
+ my $ent = shift;
+ my $val = shift;
+
+ if (!$ent || !$val) {
+ return (0, 0);
+ }
+
+ my $len = length($val);
+ my $pad;
+ my $timefmt;
+ if ($len <= 20) {
+ $pad = 2; # padding for short H values
+ $timefmt = 'I'; # timevals are unsigned 32-bit int
+ } else {
+ $pad = 6; # padding for short H values
+ $timefmt = 'Q'; # timevals are unsigned 64-bit int
+ }
+ # short - padbytes - 3 timevals - short - padbytes
+ my $fmtstr = "Sx" . $pad . $timefmt . "3Sx" . $pad;
+ my ($rid, $sampled_time, $local_offset, $remote_offset, $seq_num) = \
unpack($fmtstr, $val); + my $hex = unpack('H*', $val);
+ my $now = time;
+ my $tdiff = abs($now - $sampled_time);
+ my $maxdiff = 86400*365*10; # 10 years
+ if ($tdiff > $maxdiff) { # try big endian
+ ($rid, $sampled_time, $local_offset, $remote_offset, $seq_num) = \
unpack("($fmtstr)>", $val); + my $tdiff = abs($now - $sampled_time);
+ if ($tdiff > $maxdiff) { # error
+ debug(0, "Error: could not parse nsstate $hex - tdiff is $tdiff seconds \
or", ($tdiff/86400), " days\n"); + return (0, 0, \
'error_could_not_parse_nsstate', $ent->getDN(), $hex); + }
+ }
+ # format for the target system
+ if ($is_big_endian) {
+ $fmtstr = "($fmtstr)>";
+ }
+ my $newval = pack($fmtstr, $rid, $sampled_time, $local_offset, $remote_offset, \
$seq_num); + my $rc = 0;
+ if ($val != $newval) { # changed
+ my $hex2 = unpack('H*', $newval);
+ debug(1, "Converted old nsState val in ", $ent->getDN(), " from $hex to \
$hex2\n"); + $rc = 1; # changed
+ }
+ return ($rc, $newval);
+}
+
+sub runinst {
+ my ($inf, $inst, $dseldif, $conn) = @_;
+
+ my $ent = $conn->search("cn=config", "sub", "(cn=uniqueid generator)");
+ if ($ent) {
+ my ($rc, $newval, @errs) = convert_uniqueid($ent, \
$ent->getValues('nsState')); + if (@errs) {
+ return @errs;
+ }
+ if ($rc) { # changed
+ if ($rc == -1) { # delete it
+ if (!$conn->delete($ent->getDN())) {
+ return ("error_deleteall_entries", $ent->getDN(), \
$conn->getErrorString()); + }
+ } else {
+ $ent->setValues('nsState', $newval);
+ if (!$conn->update($ent)) {
+ return ("error_updating_entry", $ent->getDN(), \
$conn->getErrorString()); + }
+ }
+ }
+ }
+
+ for ($ent = $conn->search("cn=config", "sub", "(cn=replica)");
+ $ent; $ent = $conn->nextEntry) {
+ my ($rc, $newval, @errs) = convert_replica($ent, \
$ent->getValues('nsState')); + if (@errs) {
+ return @errs;
+ }
+ if ($rc) { # changed
+ $ent->setValues('nsState', $newval);
+ if (!$conn->update($ent)) {
+ return ("error_updating_entry", $ent->getDN(), \
$conn->getErrorString()); + }
+ }
+ }
+
+ return ();
+}
+
+sub testit {
+#my $val = 'ACm2BdIdsgH+tw/8AAB+swEAAAA=';
+#my $val = 'AOj+tyuA4AHsNZ7S9NnxZwEAAAAAAAAA';
+my $testval = "00a43cb4d11db2018b7912fd0000a42e01000000";
+my $testdecval = $testval;
+# base16 decode
+$testdecval =~ s/(..)/chr(hex($1))/eg;
+my $ent = new Mozilla::LDAP::Entry;
+$ent->setDN("cn=uniqueid generator");
+my ($rc, $newval) = convert_uniqueid($ent, $testdecval);
+}
+
+1;
diff --git a/ldap/admin/src/scripts/setup-ds.res.in \
b/ldap/admin/src/scripts/setup-ds.res.in index 9d164e9..674b4af 100644
--- a/ldap/admin/src/scripts/setup-ds.res.in
+++ b/ldap/admin/src/scripts/setup-ds.res.in
@@ -201,3 +201,4 @@ If you proceed with this hostname, you may encounter problems.\
\
Do you want to proceed with hostname '%s'?
error_import_check_log = Error: unable to import file '%s' for backend '%s' - %s. \
Check the errrors log for additional information\n +error_could_not_parse_nsstate = \
Error: could not parse nsState from %s. Value: %s\n
--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic