Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / librewrite / xmap.c

diff --git a/libraries/librewrite/xmap.c b/libraries/librewrite/xmap.c
index 3ec9873b2dbf34450bd3c57fdbd3ef6a65b81047..f50eac06b1b990ed4a02fbbcbaa7a625aa2b1330 100644 (file)
--- a/libraries/librewrite/xmap.c
+++ b/libraries/librewrite/xmap.c
@@ -1,26 +1,21 @@
-/******************************************************************************
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright (C) 2000 Pierangelo Masarati, <ando@sys-net.it>
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission.  Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.  Since few users
- * ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
- *
- ******************************************************************************/
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENT:
+ * This work was initially developed by Pierangelo Masarati for
+ * inclusion in OpenLDAP Software.
+ */
 
 #include <portable.h>
 
@@ -30,6 +25,7 @@
 #include <pwd.h>
 #endif
 
+#define LDAP_DEPRECATED 1
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
@@ -78,6 +74,10 @@ rewrite_xmap_parse(
        if ( strncasecmp(s, "xpasswd", 7 ) == 0 ) {
                map->lm_type = REWRITE_MAP_XPWDMAP;
                map->lm_name = strdup( "xpasswd" );
+               if ( map->lm_name == NULL ) {
+                       free( map );
+                       return NULL;
+               }
 
                assert( s[7] == '}' );
                *currpos = s + 8;
@@ -99,7 +99,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;
@@ -127,6 +127,10 @@ rewrite_xmap_parse(
 
                l = p - s - c;
                filename = calloc( sizeof( char ), l + 1 );
+               if ( filename == NULL ) {
+                       free( map );
+                       return NULL;
+               }
                AC_MEMCPY( filename, s + c, l );
                filename[ l ] = '\0';
                
@@ -181,6 +185,10 @@ rewrite_xmap_parse(
                 */
                l = p - s - c;
                url = calloc( sizeof( char ), l + 3 );
+               if ( url == NULL ) {
+                       free( map );
+                       return NULL;
+               }
                AC_MEMCPY( url, s + c, l );
                url[ l ] = '\0';
 
@@ -218,7 +226,8 @@ rewrite_xmap_parse(
        
        /* Unhandled map */
        }
-       
+
+       free( map );
        return NULL;
 }
 
@@ -263,27 +272,18 @@ 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 );
                        
                        val->bv_val = strdup( pwd->pw_gecos );
-                       if ( val->bv_val == NULL ) {
-
-#ifdef USE_REWRITE_LDAP_PVT_THREADS
-                               ldap_pvt_thread_mutex_unlock( &xpasswd_mutex );
-#endif /* USE_REWRITE_LDAP_PVT_THREADS */
-
-                               rc = REWRITE_ERR;
-                               break;
-                       }
                        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;
@@ -292,7 +292,10 @@ rewrite_xmap_apply(
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
                ldap_pvt_thread_mutex_unlock( &xpasswd_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
-                       
+
+               if ( val->bv_val == NULL ) {
+                       rc = REWRITE_ERR;
+               }
                break;
        }
 #endif /* HAVE_GETPWNAM*/
@@ -403,31 +406,27 @@ rewrite_xmap_apply(
                }
                if ( attrsonly == 1 ) {
                        val->bv_val = ldap_get_dn( ld, entry );
-                       if ( val->bv_val == NULL ) {
-                               ldap_msgfree( res );
-                                ldap_unbind( ld );
-                                rc = REWRITE_ERR;
-                                goto rc_return;
-                        }
+
                } else {
                        values = ldap_get_values( ld, entry,
                                        lud->lud_attrs[0] );
-                       if ( values == NULL ) {
-                               ldap_msgfree( res );
-                               ldap_unbind( ld );
-                               rc = REWRITE_ERR;
-                               goto rc_return;
+                       if ( values != NULL ) {
+                               val->bv_val = strdup( values[ 0 ] );
+                               ldap_value_free( values );
                        }
-                       val->bv_val = strdup( values[ 0 ] );
-                       ldap_value_free( values );
                }
-               val->bv_len = strlen( val->bv_val );
 
                ldap_msgfree( res );
                ldap_unbind( ld );
                
+               if ( val->bv_val == NULL ) {
+                       rc = REWRITE_ERR;
+                       goto rc_return;
+               }
+               val->bv_len = strlen( val->bv_val );
+
                rc = REWRITE_SUCCESS;
-       }
+       } break;
        }
 
 rc_return:;
@@ -441,8 +440,8 @@ rewrite_xmap_destroy(
 {
        struct rewrite_map *map;
 
-       assert( pmap );
-       assert( *pmap );
+       assert( pmap != NULL );
+       assert( *pmap != NULL );
 
        map = *pmap;