Merge in new buildenv from HEAD

[openldap] / servers / slapd / back-passwd / search.c

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index e32e8b9b6dbb65f7f6d4dfeb80085a0f6e5d1892..76386d756b0d415c524ce8a15cc49e24a2d1bdb0 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -312,7 +312,7 @@ pw2entry( Backend *be, struct passwd *pw, Entry *e )
        attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );        /* required by person */
        attr_merge_normalize_one( e, ad_sn, &val, NULL );       /* required by person */
 
-#ifdef HAVE_PW_GECOS
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
        /*
         * if gecos is present, add it as a cn. first process it
         * according to standard BSD usage. If the processed cn has
@@ -352,7 +352,7 @@ pw2entry( Backend *be, struct passwd *pw, Entry *e )
                        attr_merge_normalize_one( e, ad_sn, &val, NULL );
                }
        }
-#endif /* HAVE_PW_GECOS */
+#endif /* HAVE_STRUCT_PASSWD_PW_GECOS */
 
        return( 0 );
 }