diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:23:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:23:54 +0000 |
| commit | fe2751bf1e0388ddfa3fdfa88ed70b2bc94e2173 (patch) | |
| tree | 5f743c2fcc2c85b0363602a14ac3753bc5a19abc /debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch | |
| parent | Adding upstream version 2.4.47+dfsg. (diff) | |
| download | openldap-debian.tar.xz openldap-debian.zip | |
Adding debian version 2.4.47+dfsg-3+deb10u7.debian/2.4.47+dfsg-3+deb10u7debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch')
| -rw-r--r-- | debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch b/debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch new file mode 100644 index 0000000..b7e32cc --- /dev/null +++ b/debian/patches/ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch @@ -0,0 +1,42 @@ +From 5a2017d4e61a6ddc4dcb4415028e0d08eb6bca26 Mon Sep 17 00:00:00 2001 +From: Howard Chu <hyc@openldap.org> +Date: Tue, 1 Dec 2020 18:32:35 +0000 +Subject: [PATCH] ITS#9412 fix AVA_Sort on invalid RDN + +--- + servers/slapd/dn.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c +index 06698b089e..7a095ba9e9 100644 +--- a/servers/slapd/dn.c ++++ b/servers/slapd/dn.c +@@ -233,6 +233,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs ) + { + LDAPAVA *ava_i; + int i; ++ int rc = LDAP_SUCCESS; + + assert( rdn != NULL ); + +@@ -250,7 +251,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs ) + /* RFC4512 does not allow multiple AVAs + * with the same attribute type in RDN (ITS#5968) */ + if ( a == 0 ) +- return LDAP_INVALID_DN_SYNTAX; ++ rc = LDAP_INVALID_DN_SYNTAX; + + if ( a > 0 ) + break; +@@ -259,7 +260,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs ) + } + rdn[ j+1 ] = ava_i; + } +- return LDAP_SUCCESS; ++ return rc; + } + + static int +-- +2.20.1 + |