equal
deleted
inserted
replaced
|
1 Fixes problem with OpenLDAP server configuration in Solaris. |
|
2 Patch was generated from upstream. |
|
3 |
|
4 --- openldap-2.4.30/servers/slapd/overlays/deref.c.old Fri Jun 26 13:59:18 2015 |
|
5 +++ openldap-2.4.30/servers/slapd/overlays/deref.c Fri Jun 26 13:59:40 2015 |
|
6 @@ -182,7 +182,8 @@ |
|
7 ber_len_t cnt = sizeof(struct berval); |
|
8 ber_len_t off = 0; |
|
9 |
|
10 - if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR ) |
|
11 + if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR |
|
12 + || !cnt ) |
|
13 { |
|
14 rs->sr_text = "Dereference control: derefSpec decoding error"; |
|
15 rs->sr_err = LDAP_PROTOCOL_ERROR; |