Assume TLS is properly configured if any one of

[openldap] / libraries / libldap / add.c

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index a8281f4c0eb6fb5a8cb059850c533187ae9b26d7..35b0cb6ed1a77134af61b214ab1a127efb3fdb0a 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,13 +1,23 @@
+/* add.c */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 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-2005 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  add.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * 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>.
+ */
+/* 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.
  */
 
 /*
@@ -98,8 +108,9 @@ 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 );
@@ -115,8 +126,9 @@ ldap_add_ext(
                return ld->ld_errno;
        }
 
+       LDAP_NEXT_MSGID(ld, id);
        rc = ber_printf( ber, "{it{s{", /* '}}}' */
-               ++ld->ld_msgid, LDAP_REQ_ADD, dn );
+               id, LDAP_REQ_ADD, dn );
 
        if ( rc == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -159,7 +171,7 @@ ldap_add_ext(
        }
 
        /* 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;