X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-passwd%2Fsearch.c;h=590cff51bca81bac0875c43ac6091b08b51499ef;hb=d490fd9f794be8866605998e7eff5add81f13ac9;hp=c7239695dc0f2a640a7be3ba0f0abdd26bb1735d;hpb=d534e1149505c44f6ff2c0631e56c1c11d687c5d;p=openldap diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c index c7239695dc..590cff51bc 100644 --- a/servers/slapd/back-passwd/search.c +++ b/servers/slapd/back-passwd/search.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2013 The OpenLDAP Foundation. + * Copyright 1998-2015 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -327,6 +327,7 @@ pw2entry( Backend *be, struct passwd *pw, Entry *e ) */ if (pw->pw_gecos[0]) { char *s; + char buf[1024]; ber_str2bv( pw->pw_gecos, 0, 0, &val ); attr_merge_normalize_one( e, ad_desc, &val, NULL ); @@ -336,8 +337,6 @@ pw2entry( Backend *be, struct passwd *pw, Entry *e ) s = ber_bvchr( &val, '&' ); if ( s ) { - char buf[1024]; - if( val.bv_len + pwlen < sizeof(buf) ) { int i = s - val.bv_val; strncpy( buf, val.bv_val, i );