X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibrewrite%2Fxmap.c;h=fbc73d0bf4050d9011c9535128d42adfb843d56d;hb=fe8e3b7efa1a3abd22f3c9ebf4b82ae28f270d74;hp=a70ecb623413961995bf464e4848ae7b5eed822d;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/libraries/librewrite/xmap.c b/libraries/librewrite/xmap.c
index a70ecb6234..fbc73d0bf4 100644
--- a/libraries/librewrite/xmap.c
+++ b/libraries/librewrite/xmap.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@ rewrite_xmap_parse(
 	 * Experimental file map:
 	 * looks up key in a `key value' ascii file
 	 */
-	} else if ( strncasecmp(s, "xfile", 5 ) == 0 ) {
+	} else if ( strncasecmp( s, "xfile", 5 ) == 0 ) {
 		char *filename;
 		const char *p;
 		int l;
@@ -259,11 +259,11 @@ rewrite_xmap_apply(
 			ldap_pvt_thread_mutex_unlock( &xpasswd_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 
-			rc = REWRITE_NO_SUCH_OBJECT;
+			rc = LDAP_NO_SUCH_OBJECT;
 			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;