X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flber.h;h=5fb2c8a9ee73e247d21d954ab27ab758ec039021;hb=53d6d3c95755e16b1b9240c1fd928bb6fc8deab1;hp=05033bdf6c31fa470e29e7296856df35d68592af;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/include/lber.h b/include/lber.h
index 05033bdf6c..5fb2c8a9ee 100644
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,7 @@ typedef struct lber_memory_fns {
 #define LBER_OPT_SOCKBUF_DEBUG		0x1002
 
 /* on/off values */
-extern char ber_pvt_opt_on;
+LBER_V( char ) ber_pvt_opt_on;
 #define LBER_OPT_ON		((void *) &ber_pvt_opt_on)
 #define LBER_OPT_OFF	((void *) 0)
 
@@ -423,10 +423,20 @@ LBER_F( void )
 ber_free_buf LDAP_P(( BerElement *ber ));
 
 LBER_F( int )
-ber_flush LDAP_P((
+ber_flush2 LDAP_P((
 	Sockbuf *sb,
 	BerElement *ber,
 	int freeit ));
+#define LBER_FLUSH_FREE_NEVER		(0x0)	/* traditional behavior */
+#define LBER_FLUSH_FREE_ON_SUCCESS	(0x1)	/* traditional behavior */
+#define LBER_FLUSH_FREE_ON_ERROR	(0x2)
+#define LBER_FLUSH_FREE_ALWAYS		(LBER_FLUSH_FREE_ON_SUCCESS|LBER_FLUSH_FREE_ON_ERROR)
+
+LBER_F( int )
+ber_flush LDAP_P((
+	Sockbuf *sb,
+	BerElement *ber,
+	int freeit )); /* DEPRECATED */
 
 LBER_F( BerElement * )
 ber_alloc LDAP_P(( void )); /* DEPRECATED */
@@ -584,11 +594,11 @@ ber_bvdup LDAP_P((
 
 LBER_F( struct berval * )
 ber_mem2bv LDAP_P((
-	LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
+	LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
 
 LBER_F( struct berval * )
 ber_str2bv LDAP_P((
-	LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
+	LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
 
 #define	ber_bvstr(a)	((ber_str2bv)((a), 0, 0, NULL))
 #define	ber_bvstrdup(a)	((ber_str2bv)((a), 0, 1, NULL))
@@ -597,6 +607,10 @@ LBER_F( char * )
 ber_strdup LDAP_P((
 	LDAP_CONST char * ));
 
+LBER_F( struct berval * )
+ber_bvreplace LDAP_P((
+	struct berval *dst, LDAP_CONST struct berval *src ));
+
 LBER_F( void )
 ber_bvarray_free LDAP_P(( BerVarray p ));