better fix for ITS#4483

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index c3c0da6485cabd1187b6984c22e9b0d6198ae4db..522ff4c88703763b638fcdb83dd5e5eb3181d75b 100644 (file)
--- 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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 */
@@ -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 ));