Masato Taruishi
taru****@users*****
2004年 10月 30日 (土) 14:46:14 JST
===================================================================
RCS file: utils/misc/ldifdiff/ldifdiff,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- utils/misc/ldifdiff/ldifdiff 2004/10/30 05:36:32 1.8
+++ utils/misc/ldifdiff/ldifdiff 2004/10/30 05:46:14 1.9
@@ -51,6 +51,7 @@
foreach (split /\n/, $buf ) {
if( $_ =~ /^([^:]+):<\s*(.*)/ ) {
# TODO: handle :< attribute value
+ die "format ':<' not supported yet"
} else {
$e = $e . $_;
}
@@ -75,18 +76,18 @@
print $modfh "changetype: modify\n";
foreach (split /\n/, $oldentry) {
- if ( $_ =~ /(([^:]+)(:+)\s*\S+)/ ) {
+ if ( $_ =~ /(([^:]+)(:+)\s*.+)/ ) {
$oldattr{$2} = "" if ! $oldattr{$2};
- $oldattr{$2} = $oldattr{$1} . $1;
+ $oldattr{$2} = $oldattr{$2} . $1;
} else {
print STDERR "Unsupported ldif format: $_\n";
}
}
foreach (split /\n/, $newentry) {
- if ( $_ =~ /(([^:]+)(:+)\s*\S+)/ ) {
+ if ( $_ =~ /(([^:]+)(:+)\s*.+)/ ) {
$newattr{$2} = "" if ! $newattr{$2};
- $newattr{$2} = $newattr{$1} . $1;
+ $newattr{$2} = $newattr{$2} . $1;
} else {
print STDERR "Unsupported ldif format: $_\n";
}