Add LDAP_DEPRECATED macro

[openldap] / libraries / libldap / vlvctrl.c

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index b1638cfe893ef63de613b0542f681b44f5f90108..985c41793ddd2b69bfa0273ae3f11eb20de83a80 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -1,10 +1,18 @@
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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.
+ *
+ * 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>.
  */
-/* Adapted for inclusion into OpenLDAP by Kurt D. Zeilenga */
-/*---
- * Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
+/* Portions Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
  *
  * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND
  * TREATIES. USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT
@@ -14,7 +22,14 @@
  * OF THIS WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP
  * PUBLIC LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT
  * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
- *---*/
+ *---
+ * Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License
+ * can be found in the file "build/LICENSE-2.0.1" in this distribution
+ * of OpenLDAP Software.
+ */
+/* Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
+ */
 
 #include "portable.h"
 
@@ -80,6 +95,7 @@ ldap_create_vlv_control( LDAP *ld,
        BerElement *ber;
 
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
        assert( vlvinfop != NULL );
        assert( ctrlp != NULL );
 
@@ -203,6 +219,7 @@ ldap_parse_vlv_control(
        ber_len_t berLen;
 
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
 
        if (contextp) {
                *contextp = NULL;        /* Make sure we return a NULL if error occurs. */