ITS#6595

[openldap] / libraries / libldap / modify.c

diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index 8e0323fafc0d889bb19ff493ebe9247d3042822c..86b7319881a9a5cadd94f9aec297a4e1aa175218 100644 (file)
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,9 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 
@@ -29,6 +26,32 @@
 
 #include "ldap-int.h"
 
+/* A modify request/response looks like this:
+ *        ModifyRequest ::= [APPLICATION 6] SEQUENCE {              
+ *             object          LDAPDN,
+ *             changes         SEQUENCE OF change SEQUENCE {
+ *                  operation       ENUMERATED {      
+ *                       add     (0),                
+ *                       delete  (1),                 
+ *                       replace (2),
+ *                       ...  },
+ *                  modification    PartialAttribute } }                  
+ *
+ *        PartialAttribute ::= SEQUENCE {
+ *             type       AttributeDescription,
+ *             vals       SET OF value AttributeValue }
+ *
+ *        AttributeDescription ::= LDAPString           
+ *              -- Constrained to <attributedescription> [RFC4512]
+ *                                      
+ *        AttributeValue ::= OCTET STRING
+ *             
+ *        ModifyResponse ::= [APPLICATION 7] LDAPResult
+ *
+ * (Source: RFC 4511)
+ */
+
+
 /*
  * ldap_modify_ext - initiate an ldap extended modify operation.
  *
@@ -65,25 +88,6 @@ ldap_modify_ext( LDAP *ld,
        int             i, rc;
        ber_int_t       id;
 
-       /*
-        * A modify request looks like this:
-        *      ModifyRequet ::= SEQUENCE {
-        *              object          DistinguishedName,
-        *              modifications   SEQUENCE OF SEQUENCE {
-        *                      operation       ENUMERATED {
-        *                              add     (0),
-        *                              delete (1),
-        *                              replace (2),
-        *                              increment (3) -- extension
-        *                      },
-        *                      modification    SEQUENCE {
-        *                              type    AttributeType,
-        *                              values  SET OF AttributeValue
-        *                      }
-        *              }
-        *      }
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 );
 
        /* check client controls */
@@ -103,22 +107,25 @@ ldap_modify_ext( LDAP *ld,
                return( ld->ld_errno );
        }
 
-       /* for each modification to be performed... */
-       for ( i = 0; mods[i] != NULL; i++ ) {
-               if (( mods[i]->mod_op & LDAP_MOD_BVALUES) != 0 ) {
-                       rc = ber_printf( ber, "{e{s[V]N}N}",
-                           (ber_int_t) ( mods[i]->mod_op & ~LDAP_MOD_BVALUES ),
-                           mods[i]->mod_type, mods[i]->mod_bvalues );
-               } else {
-                       rc = ber_printf( ber, "{e{s[v]N}N}",
-                               (ber_int_t) mods[i]->mod_op,
-                           mods[i]->mod_type, mods[i]->mod_values );
-               }
-
-               if ( rc == -1 ) {
-                       ld->ld_errno = LDAP_ENCODING_ERROR;
-                       ber_free( ber, 1 );
-                       return( ld->ld_errno );
+       /* allow mods to be NULL ("touch") */
+       if ( mods ) {
+               /* for each modification to be performed... */
+               for ( i = 0; mods[i] != NULL; i++ ) {
+                       if (( mods[i]->mod_op & LDAP_MOD_BVALUES) != 0 ) {
+                               rc = ber_printf( ber, "{e{s[V]N}N}",
+                                   (ber_int_t) ( mods[i]->mod_op & ~LDAP_MOD_BVALUES ),
+                                   mods[i]->mod_type, mods[i]->mod_bvalues );
+                       } else {
+                               rc = ber_printf( ber, "{e{s[v]N}N}",
+                                       (ber_int_t) mods[i]->mod_op,
+                                   mods[i]->mod_type, mods[i]->mod_values );
+                       }
+
+                       if ( rc == -1 ) {
+                               ld->ld_errno = LDAP_ENCODING_ERROR;
+                               ber_free( ber, 1 );
+                               return( ld->ld_errno );
+                       }
                }
        }
 
@@ -194,7 +201,7 @@ ldap_modify_ext_s( LDAP *ld, LDAP_CONST char *dn,
        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 ) );