Update copyright (including with or without modification clarification)

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index f45b59ab13f37e3a3b52e437731722404788c88b..8ff10d51c98b935c0b127979379c3d2b57ea2835 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
@@ -82,7 +83,6 @@ LDAP_BEGIN_DECL
 
 /* LBER BerElement options */
 #define LBER_USE_DER           0x01
-#define LBER_USE_INDEFINITE_LEN        0x02
 
 /* get/set options for BerElement */
 #define LBER_OPT_BER_OPTIONS                   0x01
@@ -103,6 +103,7 @@ LDAP_BEGIN_DECL
 
 /* get/set Memory Debug options */
 #define LBER_OPT_MEMORY_INUSE          0x8005  /* for memory debugging */
+#define LBER_OPT_LOG_PROC           0x8006  /* for external logging function */
 
 typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
 
@@ -131,8 +132,10 @@ typedef struct lber_memory_fns {
 #define LBER_SB_OPT_DRAIN              10
 #define LBER_SB_OPT_NEEDS_READ         11
 #define LBER_SB_OPT_NEEDS_WRITE                12
+#define LBER_SB_OPT_GET_MAX_INCOMING 13
+#define LBER_SB_OPT_SET_MAX_INCOMING 14
 /* Largest option used by the library */
-#define LBER_SB_OPT_OPT_MAX            12
+#define LBER_SB_OPT_OPT_MAX            14
 
 /* LBER IO operations stacking levels */
 #define LBER_SBIOD_LEVEL_PROVIDER      10
@@ -219,7 +222,6 @@ LBER_F( void )
 ber_sos_dump LDAP_P((
        Seqorset *sos ));
 
-
 /*
  * in decode.c:
  */
@@ -431,7 +433,7 @@ ber_get_next LDAP_P((
        BerElement *ber ));
 
 LBER_F( void )
-ber_init_w_nullc LDAP_P((
+ber_init_w_nullc LDAP_P((      /* DEPRECATED */
        BerElement *ber,
        int options ));