Attachment 150442 Details for Bug 233027 – cvs diff template-db2bak.pl.in template-db2ldif.pl.in

[patch] cvs diff template-db2bak.pl.in template-db2ldif.pl.in

utils.diffs (text/plain), 3.32 KB, created by Noriko Hosoi on 2007-03-19 22:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-19 22:41:48 UTC

Size: 3.32 KB

patch

obsolete

>Index: template-db2bak.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 template-db2bak.pl.in
>--- template-db2bak.pl.in	19 Mar 2007 17:49:53 -0000	1.5
>+++ template-db2bak.pl.in	19 Mar 2007 22:36:12 -0000
>@@ -117,7 +117,8 @@
> if ($verbose != 0) { $vstr = "-v"; }
> $ENV{'PATH'} = "$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
> $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
> $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
>+print("Back up directory: $archivedir\n");
> open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" );
> print(FOO "$entry");
> close(FOO);
>Index: template-db2ldif.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 template-db2ldif.pl.in
>--- template-db2ldif.pl.in	12 Feb 2007 19:55:10 -0000	1.4
>+++ template-db2ldif.pl.in	19 Mar 2007 22:36:12 -0000
>@@ -194,32 +194,45 @@
> if (($instances[0] eq "" && $included[0] eq "") || $rootdn eq "" || $passwd eq "") { &usage; exit(1); }
> ($s, $m, $h, $dy, $mn, $yr, $wdy, $ydy, $r) = localtime(time);
> $mn++; $yr += 1900;
> $taskname = "export_${yr}_${mn}_${dy}_${h}_${m}_${s}";
>-if ($ldiffile eq "") {
>-        $ldiffile = "${ldifdir}{{SEP}}${servid}-${yr}_${mn}_${dy}_${h}_${m}_${s}.ldif";
>-}
> $dn = "dn: cn=$taskname, cn=export, cn=tasks, cn=config\n";
> $misc = "changetype: add\nobjectclass: top\nobjectclass: extensibleObject\n";
> $cn =  "cn: $taskname\n";
> $i = 0;
>+$be = "";
> $nsinstance = "";
> while ("" ne "$instances[$i]") {
>         $nsinstance = "${nsinstance}nsInstance: $instances[$i]\n";
>+        if ( "" eq "$be" ) {
>+                $be = "$instances[$i]";
>+        } else {
>+                $be = "${be}-$instances[$i]";
>+        }
>         $i++;
> }
> $i = 0;
> $nsincluded = "";
> while ("" ne "$included[$i]") {
>         $nsincluded = "${nsincluded}nsIncludeSuffix: $included[$i]\n";
>+        my ($rdn, $rest) = split(/,/, $included[$i]);
>+        my ($rest, $tmpbe) = split(/=/, $rdn);
>+        if ( "" eq "$be" ) {
>+                $be = "$tmpbe";
>+        } else {
>+                $be = "${be}-$tmpbe";
>+        }
>         $i++;
> }
> $i = 0;
> $nsexcluded = "";
> while ("" ne "$excluded[$i]") {
>         $nsexcluded = "${nsexcluded}nsExcludeSuffix: $excluded[$i]\n";
>         $i++;
> }
>+if ($ldiffile eq "") {
>+        $ldiffile = "${ldifdir}{{SEP}}${servid}-${be}-${yr}_${mn}_${dy}_${h}_${m}_${s}.ldif";
>+}
> $nsreplica = "";
> if ($doreplica != 0) { $nsreplica = "nsExportReplica: true\n"; }
> $nsnobase64 = "";
> if ($nobase64 != 0) { $nsnobase64 = "nsMinimalEncoding: true\n"; }
>@@ -244,7 +257,8 @@
> if ($verbose != 0) { $vstr = "-v"; }
> $ENV{'PATH'} = "$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
> $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
> $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
>+print("Exported ldif file: ${ldiffile}\n");
> open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" );
> print(FOO "$entry");
> close(FOO);

Actions: View | Diff

Attachments on bug 233027: 150442 | 150443 | 150447 | 150451 | 150717 | 150813 | 151242