Replace PW_GECOS/PASSWD macros

[openldap] / libraries / librewrite / xmap.c

diff --git a/libraries/librewrite/xmap.c b/libraries/librewrite/xmap.c
index 876c4dadea45a659ed894e665c9f09c5f8ee531e..b2ea0cfe08a902dde3f385f69268fcf5857e346f 100644 (file)
--- 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-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,7 @@
 #include <pwd.h>
 #endif
 
+#define LDAP_DEPRECATED 1
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
@@ -94,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;
@@ -258,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 );
                        
@@ -278,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;
@@ -436,8 +437,8 @@ rewrite_xmap_destroy(
 {
        struct rewrite_map *map;
 
-       assert( pmap );
-       assert( *pmap );
+       assert( pmap != NULL );
+       assert( *pmap != NULL );
 
        map = *pmap;