Masato Taruishi
taru****@sourc*****
2004年 6月 16日 (水) 14:02:43 JST
===================================================================
RCS file: ultrapossum/tools/ultramigration,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/tools/ultramigration 2004/06/08 10:48:12 1.7
+++ ultrapossum/tools/ultramigration 2004/06/16 05:02:43 1.8
@@ -164,20 +164,23 @@
EOF
close( $tmpfh );
+sub modify
+{
+ system( "cat $add | ldapadd -x -h $master -D $rootdn -w $rootpw" ) == 0 or die;
+ system( "cat $mod | ldapmodify -x -h $master -D $rootdn -w $rootpw" ) == 0 or die;
+}
+
system( "ldapdiff -f $tmp -p ou -c $conf" ) == 0 or die "ldapdiff error\n";
-system( "cat $add $mod | ldapmodify -x -h $master -D $rootdn -w $rootpw" ) == 0
- or die;
+modify();
chdir "/usr/share/migrationtools";
$ENV{LDAP_BASEDN} = $suffix;
system( "./migrate_passwd.pl /etc/passwd > $tmp ") == 0 or die;
system( "ldapdiff -f $tmp -p passwd -c $conf" ) == 0 or die;
-system( "cat $add $mod | ldapmodify -x -h $master -D $rootdn -w $rootpw" ) == 0
- or die;
+modify();
system( "./migrate_group.pl /etc/group > $tmp" ) == 0 or die;
system( "ldapdiff -f $tmp -p group -c $conf") == 0 or die;
-system( "cat $add $mod | ldapmodify -x -h $master -D $rootdn -w $rootpw" ) == 0
- or die;
+modify();