- val.bv_val = pw->pw_gecos;
- val.bv_len = strlen(val.bv_val);
- attr_merge(e, ad_description, vals);
-
- s = strchr(val.bv_val, ',');
- if (s) *s = '\0';
-
- s = strchr(val.bv_val, '&');
- if (s) {
- char buf[256];
- int i = s - val.bv_val;
- strncpy(buf, val.bv_val, i);
- s = buf+i;
- strcpy(s, pw->pw_name);
- *s = TOUPPER(*s);
- strcat(s, val.bv_val+i+1);
- val.bv_val = buf;
+ ber_str2bv( pw->pw_gecos, 0, 0, &val );
+ attr_merge_normalize_one( e, ad_desc, &val, NULL );
+
+ s = ber_bvchr( &val, ',' );
+ if ( s ) *s = '\0';
+
+ 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 );
+ s = buf + i;
+ strcpy( s, pw->pw_name );
+ *s = TOUPPER((unsigned char)*s);
+ strcat( s, val.bv_val + i + 1 );
+ val.bv_val = buf;
+ }
+ }
+ val.bv_len = strlen( val.bv_val );
+
+ if ( val.bv_len && strcasecmp( val.bv_val, pw->pw_name ) ) {
+ attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );