X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fadd.c;h=35b0cb6ed1a77134af61b214ab1a127efb3fdb0a;hb=0ea43c9d7d2fbf08b2078931bebfcaf443230878;hp=d945988a390d07881b641ed7bdbd64a9e31708ff;hpb=8c772985c7b7300665a30932d71d45c8af24af21;p=openldap
diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index d945988a39..35b0cb6ed1 100644
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,12 +1,23 @@
-/*
- * Copyright 1998-1999 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.
+/* add.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
+ */
+/* 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.
*/
/*
@@ -97,21 +108,27 @@ ldap_add_ext(
{
BerElement *ber;
int i, rc;
+ ber_int_t id;
- Debug( LDAP_DEBUG_TRACE, "ldap_add\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );
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 '}}}' */
- ++ld->ld_msgid, LDAP_REQ_ADD, dn );
+ LDAP_NEXT_MSGID(ld, id);
+ rc = ber_printf( ber, "{it{s{", /* '}}}' */
+ id, LDAP_REQ_ADD, dn );
if ( rc == -1 ) {
ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -122,10 +139,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 +152,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,15 +164,14 @@ 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;
}
/* send the message */
- *msgidp = ldap_send_initial_request( ld, LDAP_REQ_ADD, dn, ber );
+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_ADD, dn, ber, id );
if(*msgidp < 0)
return ld->ld_errno;