[Fedora-directory-commits] adminserver/admserv/newinst/src AdminMigration.pm.in, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22001

Modified Files:
	AdminMigration.pm.in 
Log Message:
Resolves: #252190
Summary: 7.1 to 8.0 Migration Bug (comment #18)



Index: AdminMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AdminMigration.pm.in	15 Aug 2007 22:08:14 -0000	1.4
+++ AdminMigration.pm.in	16 Aug 2007 00:34:04 -0000	1.5
@@ -84,16 +84,17 @@
         close(DBSWITCH);
     }
     if (!defined($mig->{inf}->{General}->{ConfigDirectoryAdminID})) {
-        if (!open(LDAPCONF, $mig->{oldsroot} . "/shared/config/ldap.conf")) {
-            $mig->msg('error_opening_ldapconf', $mig->{oldsroot} . "/shared/config/ldap.conf", $!);
+        if (!open(ADMPW, $mig->{oldsroot} . "/admin-serv/config/admpw")) {
+            $mig->msg('error_opening_ldapconf', $mig->{oldsroot} . "/admin-serv/config/admpw", $!);
             return 0;
         }
-        while (<LDAPCONF>) {
-            if (/^admnm\s+(.*)$/) {
+        while (<ADMPW>) {
+            next if (/^#/);
+            if (/^(.*):.*$/) {
                 $mig->{inf}->{General}->{ConfigDirectoryAdminID} = $1;
             }
         }
-        close(LDAPCONF);
+        close(ADMPW);
     }
     if (!defined($mig->{inf}->{General}->{SuiteSpotGroup}) or
         !defined($mig->{inf}->{General}->{SuiteSpotUserID})) {
@@ -140,7 +141,7 @@
 # This is how we extract the sie and isie as the as entries are
 # being added
 sub migratecb {
-	my ($context, $entry, $errs) = @_;
+    my ($context, $entry, $errs) = @_;
 
     my @arycontext = ($context);
     # always replace the tasks and commands with the new ones
@@ -233,7 +234,7 @@
 }
 
 sub updateconinfocb {
-	my ($context, $entry, $errs) = @_;
+    my ($context, $entry, $errs) = @_;
 
     my @arycontext = ($context);
     # add or update all of the entries except for the UserDirectory