From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 29 Jul 2009 17:07:52 +0000 (+0000)
Subject: For ITS#6215: Do not expose obsolete Seqorset. Note ber_write(,,,nonzero) is gone.
X-Git-Tag: ACLCHECK_0~386
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4bed42ae5aacf4d2045ea029d1f1c147c63c1d6a;p=openldap

For ITS#6215: Do not expose obsolete Seqorset. Note ber_write(,,,nonzero) is gone.
---

diff --git a/include/lber.h b/include/lber.h
index e3a8e668a8..a347692cd8 100644
--- a/include/lber.h
+++ b/include/lber.h
@@ -165,7 +165,6 @@ LBER_V( char ) ber_pvt_opt_on;
 
 typedef struct berelement BerElement;
 typedef struct sockbuf Sockbuf;
-typedef struct seqorset Seqorset;
 
 typedef struct sockbuf_io Sockbuf_IO;
 
@@ -229,10 +228,6 @@ LBER_F( void )
 ber_dump LDAP_P((
 	BerElement *ber, int inout ));
 
-LBER_F( void )
-ber_sos_dump LDAP_P((
-	Seqorset *sos ));
-
 /*
  * in decode.c:
  */
@@ -434,7 +429,7 @@ ber_write LDAP_P((
 	BerElement *ber,
 	LDAP_CONST char *buf,
 	ber_len_t len,
-	int nosos ));
+	int zero ));	/* nonzero is unsupported from OpenLDAP 2.4.18 */
 
 LBER_F( void )
 ber_free LDAP_P((
diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index faf17b2a9a..d34be5b634 100644
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -276,6 +276,8 @@ ber_dump(
 	ber_bprint( ber->ber_ptr, len );
 }
 
+typedef struct seqorset Seqorset;
+
 /* Exists for binary compatibility with OpenLDAP 2.4.17-- */
 int
 ber_log_sos_dump(
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index cc6958e69f..84e7b7f380 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -129,7 +129,6 @@ int
 ber_realloc( BerElement *ber, ber_len_t len )
 {
 	ber_len_t	total, offset, sos_offset;
-	Seqorset	*s;
 	char		*buf;
 
 	assert( ber != NULL );
@@ -184,8 +183,6 @@ ber_realloc( BerElement *ber, ber_len_t len )
 void
 ber_free_buf( BerElement *ber )
 {
-	Seqorset *s, *next;
-
 	assert( LBER_VALID( ber ) );
 
 	if ( ber->ber_buf) ber_memfree_x( ber->ber_buf, ber->ber_memctx );
diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h
index 818caca916..1912266eeb 100644
--- a/libraries/liblber/lber-int.h
+++ b/libraries/liblber/lber-int.h
@@ -185,12 +185,6 @@ ber_log_dump LDAP_P((
 	BerElement *ber,
 	int inout ));
 
-LBER_F( int )
-ber_log_sos_dump LDAP_P((
-	int errlvl,
-	int loglvl,
-	Seqorset *sos ));
-
 LBER_V (BER_LOG_FN) ber_int_log_proc;
 LBER_V (FILE *) ber_pvt_err_file;