ITS#7428 Use non-blocking IO during SSL Handshake

[openldap] / libraries / libldap / add.c

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 383c7da49f6e5ef7af09de13494843fb3c622fac..33f7f61199ec6dc9506dc3687ce8a333663c74ab 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,24 +1,20 @@
+/* add.c */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*  Portions
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- *  add.c
+ * 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>.
  */
-
-/*
- * An add request looks like this:
- *     AddRequest ::= SEQUENCE {
- *             entry   DistinguishedName,
- *             attrs   SEQUENCE OF SEQUENCE {
- *                     type    AttributeType,
- *                     values  SET OF AttributeValue
- *             }
- *     }
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
@@ -31,6 +27,30 @@
 
 #include "ldap-int.h"
 
+/* An LDAP Add Request/Response looks like this:
+ *        AddRequest ::= [APPLICATION 8] SEQUENCE {
+ *            entry           LDAPDN,
+ *            attributes      AttributeList }
+ *
+ *        AttributeList ::= SEQUENCE OF attribute Attribute
+ *
+ *        Attribute ::= PartialAttribute(WITH COMPONENTS {
+ *             ...,
+ *             vals (SIZE(1..MAX))})
+ *
+ *        PartialAttribute ::= SEQUENCE {
+ *             type       AttributeDescription,
+ *             vals       SET OF value AttributeValue }
+ *
+ *        AttributeDescription ::= LDAPString           
+ *             -- Constrained to <attributedescription> [RFC4512]
+ *                                      
+ *        AttributeValue ::= OCTET STRING
+ *        
+ *        AddResponse ::= [APPLICATION 9] LDAPResult 
+ * (Source: RFC 4511)
+ */
+
 /*
  * ldap_add - initiate an ldap add operation.  Parameters:
  *
@@ -100,11 +120,7 @@ ldap_add_ext(
        int             i, rc;
        ber_int_t       id;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_add_ext\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );
-#endif
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
        assert( dn != NULL );
@@ -130,19 +146,45 @@ ldap_add_ext(
                return ld->ld_errno;
        }
 
-       /* for each attribute in the entry... */
-       for ( i = 0; attrs[i] != NULL; i++ ) {
-               if ( ( attrs[i]->mod_op & LDAP_MOD_BVALUES) != 0 ) {
-                       rc = ber_printf( ber, "{s[V]N}", attrs[i]->mod_type,
-                           attrs[i]->mod_bvalues );
-               } else {
-                       rc = ber_printf( ber, "{s[v]N}", attrs[i]->mod_type,
-                           attrs[i]->mod_values );
-               }
-               if ( rc == -1 ) {
-                       ld->ld_errno = LDAP_ENCODING_ERROR;
-                       ber_free( ber, 1 );
-                       return ld->ld_errno;
+       /* allow attrs to be NULL ("touch"; should fail...) */
+       if ( attrs ) {
+               /* for each attribute in the entry... */
+               for ( i = 0; attrs[i] != NULL; i++ ) {
+                       if ( ( attrs[i]->mod_op & LDAP_MOD_BVALUES) != 0 ) {
+                               int j;
+
+                               if ( attrs[i]->mod_bvalues == NULL ) {
+                                       ld->ld_errno = LDAP_PARAM_ERROR;
+                                       ber_free( ber, 1 );
+                                       return ld->ld_errno;
+                               }
+
+                               for ( j = 0; attrs[i]->mod_bvalues[ j ] != NULL; j++ ) {
+                                       if ( attrs[i]->mod_bvalues[ j ]->bv_val == NULL ) {
+                                               ld->ld_errno = LDAP_PARAM_ERROR;
+                                               ber_free( ber, 1 );
+                                               return ld->ld_errno;
+                                       }
+                               }
+
+                               rc = ber_printf( ber, "{s[V]N}", attrs[i]->mod_type,
+                                   attrs[i]->mod_bvalues );
+
+                       } else {
+                               if ( attrs[i]->mod_values == NULL ) {
+                                       ld->ld_errno = LDAP_PARAM_ERROR;
+                                       ber_free( ber, 1 );
+                                       return ld->ld_errno;
+                               }
+
+                               rc = ber_printf( ber, "{s[v]N}", attrs[i]->mod_type,
+                                   attrs[i]->mod_values );
+                       }
+                       if ( rc == -1 ) {
+                               ld->ld_errno = LDAP_ENCODING_ERROR;
+                               ber_free( ber, 1 );
+                               return ld->ld_errno;
+                       }
                }
        }
 
@@ -189,7 +231,7 @@ ldap_add_ext_s(
        if ( rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );