Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15196/ldapserver/ldap/admin/src
Modified Files:
create_instance.c migrateTo11.in
Log Message:
Resolves: bug 245815
Description: DS Admin Migration framework
Reviewed by: nhosoi (Thanks!)
Fix Description: Created a Migration class that is very similar to the Setup class - to
act as a sort of global context for the migration process. Moved most of the guts of
migrateTo11 into the new DSMigration class and the new migrate-ds.pl - we should deprecate
migrateTo11 in favor of migrate-ds.pl. I had to enhance the check_and_add_entry function
to handle pseudo-LDIF change records - pseudo because mozilla perldap LDIF has no real
LDIF change record support.
Fixed a bug in create_instance.c - creating an instance without starting it was not
working if the port number of an existing directory server was supplied.
Added a new method createDSInstance to Util - this just wraps ds_newinst.pl for now.
Platforms tested: RHEL4
Doc: Yes. We will need to document the migration procedures.
Flag day: Yes. Autotool file changes.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- create_instance.c 28 Jun 2007 16:15:26 -0000 1.61
+++ create_instance.c 29 Jun 2007 21:12:22 -0000 1.62
@@ -437,7 +437,7 @@
/* if we don't need to start the server right away, we can skip the
port number checks
*/
- if (!needToStartServer(cf))
+ if (needToStartServer(cf))
{
if( (t = create_instance_checkports(cf)))
{
Index: migrateTo11.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migrateTo11.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrateTo11.in 16 Mar 2007 21:32:39 -0000 1.1
+++ migrateTo11.in 29 Jun 2007 21:12:22 -0000 1.2
@@ -294,38 +294,6 @@
# updateDBguardian($newdbdir);
}
-sub copySecurityFiles {
- my $oldroot = shift;
- my $inst = shift;
- my $destdir = shift;
-
- if (! -d "$oldroot/alias") {
- debug(0, "Error: security file directory $oldroot/alias not found\n");
- } elsif (! -d $destdir) {
- debug(0, "Error: new security file directory $destdir not found\n");
- } else {
- debug(1, "Copying $oldroot/alias/$inst-cert8.db to
$destdir/cert8.db\n");
- system ("cp -p $oldroot/alias/$inst-cert8.db $destdir/cert8.db") == 0
or
- die "Error: could not copy $oldroot/alias/$inst-cert8.db to
$destdir/cert8.db: $!";
- debug(1, "Copying $oldroot/alias/$inst-key3.db to
$destdir/key3.db\n");
- system ("cp -p $oldroot/alias/$inst-key3.db $destdir/key3.db") == 0 or
- die "Error: could not copy $oldroot/alias/$inst-key3.db to
$destdir/key3.db: $!";
- debug(1, "Copying $oldroot/alias/secmod.db to $destdir/secmod.db\n");
- system ("cp -p $oldroot/alias/secmod.db $destdir/secmod.db") == 0 or
- die "Error: could not copy $oldroot/alias/secmod.db to
$destdir/secmod.db: $!";
- if (-f "$oldroot/alias/$inst-pin.txt") {
- debug(1, "Copying $oldroot/alias/$inst-pin.txt to
$destdir/pin.txt\n");
- system ("cp -p $oldroot/alias/$inst-pin.txt $destdir/pin.txt")
== 0 or
- die "Error: could not copy $oldroot/alias/$inst-pin.txt to
$destdir/pin.txt: $!";
- }
- if (-f "$oldroot/shared/config/certmap.conf") {
- debug(1, "Copying $oldroot/shared/config/certmap.conf to
$destdir/certmap.conf\n");
- system ("cp -p $oldroot/shared/config/certmap.conf
$destdir/certmap.conf") == 0 or
- die "Error: could not copy $oldroot/shared/config/certmap.conf to
$destdir/certmap.conf: $!";
- }
- }
-}
-
sub copyChangelogDB {
my $oldroot = shift;
my $inst = shift;