X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibrewrite%2Fxmap.c;h=b2ea0cfe08a902dde3f385f69268fcf5857e346f;hb=474dfbc8fd75aed0376695ccc2f8c092a7a1bc6f;hp=ca6e6819be29a98e22ead559084437e5ec81ec5e;hpb=9effc2b8f00434a4c5c6da2a7f5f488cc47bfa28;p=openldap

diff --git a/libraries/librewrite/xmap.c b/libraries/librewrite/xmap.c
index ca6e6819be..b2ea0cfe08 100644
--- a/libraries/librewrite/xmap.c
+++ b/libraries/librewrite/xmap.c
@@ -263,7 +263,7 @@ rewrite_xmap_apply(
 			break;
 		}
 
-#ifdef HAVE_PW_GECOS
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
 		if ( pwd->pw_gecos != NULL && pwd->pw_gecos[0] != '\0' ) {
 			int l = strlen( pwd->pw_gecos );
 			
@@ -279,7 +279,7 @@ rewrite_xmap_apply(
 			}
 			val->bv_len = l;
 		} else
-#endif /* HAVE_PW_GECOS */
+#endif /* HAVE_STRUCT_PASSWD_PW_GECOS */
 		{
 			val->bv_val = strdup( key->bv_val );
 			val->bv_len = key->bv_len;
@@ -437,8 +437,8 @@ rewrite_xmap_destroy(
 {
 	struct rewrite_map *map;
 
-	assert( pmap );
-	assert( *pmap );
+	assert( pmap != NULL );
+	assert( *pmap != NULL );
 
 	map = *pmap;