X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fadd.c;h=1ce57eba7f6f95d4fa09a3796ea268aa5f8febf1;hb=b4243bc119b2f88318103176c7c671662c9ff371;hp=d945988a390d07881b641ed7bdbd64a9e31708ff;hpb=8c772985c7b7300665a30932d71d45c8af24af21;p=openldap

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index d945988a39..1ce57eba7f 100644
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -98,19 +99,27 @@ ldap_add_ext(
 	BerElement	*ber;
 	int		i, rc;
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_add\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "add", LDAP_LEVEL_ENTRY, "ldap_add_ext\n" ));
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );
+#endif
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 	assert( dn != NULL );
 	assert( msgidp != NULL );
 
+	/* check client controls */
+	rc = ldap_int_client_controls( ld, cctrls );
+	if( rc != LDAP_SUCCESS ) return rc;
+
 	/* create a message to send */
-	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return ld->ld_errno;
 	}
 
-	rc = ber_printf( ber, "{it{s{", /* leave open '}}}' */
+	rc = ber_printf( ber, "{it{s{", /* '}}}' */
 		++ld->ld_msgid, LDAP_REQ_ADD, dn );
 
 	if ( rc == -1 ) {
@@ -122,10 +131,10 @@ ldap_add_ext(
 	/* 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]}", attrs[i]->mod_type,
-			    attrs[i]->mod_values );
+			rc = ber_printf( ber, "{s[V]N}", attrs[i]->mod_type,
+			    attrs[i]->mod_bvalues );
 		} else {
-			rc = ber_printf( ber, "{s[v]}", attrs[i]->mod_type,
+			rc = ber_printf( ber, "{s[v]N}", attrs[i]->mod_type,
 			    attrs[i]->mod_values );
 		}
 		if ( rc == -1 ) {
@@ -135,8 +144,7 @@ ldap_add_ext(
 		}
 	}
 
-	/* close '{{' */
-	if ( ber_printf( ber, "}}" ) == -1 ) {
+	if ( ber_printf( ber, /*{{*/ "N}N}" ) == -1 ) {
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );
 		return ld->ld_errno;
@@ -148,8 +156,7 @@ ldap_add_ext(
 		return ld->ld_errno;
 	}
 
-	/* close '{' */
-	if ( ber_printf( ber, "}" ) == -1 ) {
+	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );
 		return ld->ld_errno;