X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=bin%2Fldap-rewrite.pl;h=b35822eec39b652f10ffa53ac948e14e12ad3be0;hp=48a706a0563e0b68015e616fd00978d715b4de5b;hb=5554ff3c9bd737a7238e342da520643c05805874;hpb=cd2c1b36b11137f1acb908bc8af30d6fb9db775b

diff --git a/bin/ldap-rewrite.pl b/bin/ldap-rewrite.pl
index 48a706a..b35822e 100755
--- a/bin/ldap-rewrite.pl
+++ b/bin/ldap-rewrite.pl
@@ -139,13 +139,13 @@ sub log_response {
 		foreach my $attr ( @{ $response->{protocolOp}->{searchResEntry}->{attributes} } ) {
 			if ( $attr->{type} =~ m/date/i ) {
 				foreach my $i ( 0 .. $#{ $attr->{vals} } ) {
-					$attr->{vals}->[$i] = "$1-$2-$3" if $attr->{vals}->[$i] =~ m/^([12]\d\d\d)([01]\d+)([123]\d+)$/;
+					$attr->{vals}->[$i] = "$1-$2-$3" if $attr->{vals}->[$i] =~ m/^([12]\d\d\d)([01]\d+)([0123]\d+)$/;
 				}
 			} elsif ( $attr->{type} eq 'hrEduPersonUniqueNumber' ) {
 				foreach my $val ( @{ $attr->{vals} } ) {
 					next if $val !~ m{.+:.+};
 					my ( $n, $v ) = split(/\s*:\s*/, $val );
-					push @attrs, { type => $_->{type} . '_' . $n, vals => [ $v ] };
+					push @attrs, { type => $attr->{type} . '_' . $n, vals => [ $v ] };
 				}
 			}
 		}
@@ -154,10 +154,21 @@ sub log_response {
 
 		push @{ $response->{protocolOp}->{searchResEntry}->{attributes} }, $_ foreach @attrs;
 
-		my $path = $config->{yaml_dir} . "$uid.yaml";
-		if ( -e $path ) {
-			my $data = LoadFile($path);
-			warn "# yaml = ",dump($data);
+		my @additional_yamls = ( $uid );
+		foreach my $attr ( @{ $response->{protocolOp}->{searchResEntry}->{attributes} } ) {
+			foreach my $v ( @{ $attr->{vals} } ) {
+				push @additional_yamls, $attr->{type} . '/' . $v;
+			}
+		}
+
+		#warn "# additional_yamls ",dump( @additional_yamls );
+
+		foreach my $path ( @additional_yamls ) {
+			my $full_path = $config->{yaml_dir} . '/' . $path . '.yaml';
+			next unless -e $full_path;
+
+			my $data = LoadFile( $full_path );
+			warn "# $full_path yaml = ",dump($data);
 
 			foreach my $type ( keys %$data ) {