The order of uidNumber and gidNumber was swapped in revision 1.331,

which breaks existing ACLs. This patch restores the old behaviour.

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index f84cdddaa65a50567bfefdc58a56d626eed9aebc..716123f73bdc8ac983579803eb1607e5251c261f 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1362,14 +1362,14 @@ slapd_handle_listener(
 
                        if( getpeereid( s, &uid, &gid ) == 0 ) {
                                authid.bv_val = ch_malloc(
-                                       STRLENOF( "gidNumber=4294967295+uidNumber=4294967295,"
+                                       STRLENOF( "uidNumber=4294967295+gidNumber=4294967295,"
                                        "cn=peercred,cn=external,cn=auth" ) + 1 );
                                authid.bv_len = sprintf( authid.bv_val,
-                                       "gidNumber=%d+uidNumber=%d,"
+                                       "uidNumber=%d+gidNumber=%d,"
                                        "cn=peercred,cn=external,cn=auth",
                                        (int) gid, (int) uid );
                                assert( authid.bv_len <=
-                                       STRLENOF( "gidNumber=4294967295+uidNumber=4294967295,"
+                                       STRLENOF( "uidNumber=4294967295+gidNumber=4294967295,"
                                        "cn=peercred,cn=external,cn=auth" ) );
                        }
                }