Move ldap_dnfree_x etc. decls from ldap.h to ldap_pvt.h

diff --git a/include/ldap.h b/include/ldap.h
index f20383dfbb38b3d3b3ef598d41a32a44f80713c3..be0863f26095ced9a41486af895cc28abc7bf6e8 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1260,9 +1260,7 @@ typedef LDAPRDN* LDAPDN;
 #define LDAP_DN_PEDANTIC                       0xF000U
 
 LDAP_F( void ) ldap_rdnfree LDAP_P(( LDAPRDN rdn ));
-LDAP_F( void ) ldap_rdnfree_x LDAP_P(( LDAPRDN rdn, void *ctx ));
 LDAP_F( void ) ldap_dnfree LDAP_P(( LDAPDN dn ));
-LDAP_F( void ) ldap_dnfree_x LDAP_P(( LDAPDN dn, void *ctx ));
 
 LDAP_F( int )
 ldap_bv2dn LDAP_P(( 
@@ -1270,10 +1268,6 @@ ldap_bv2dn LDAP_P((
        LDAPDN *dn, 
        unsigned flags ));
 
-LDAP_F( int )
-ldap_bv2dn_x LDAP_P(( 
-       struct berval *bv, LDAPDN *dn, unsigned flags, void *ctx ));
-
 LDAP_F( int )
 ldap_str2dn LDAP_P((
        LDAP_CONST char *str,
@@ -1286,10 +1280,6 @@ ldap_dn2bv LDAP_P((
        struct berval *bv,
        unsigned flags ));
 
-LDAP_F( int )
-ldap_dn2bv_x LDAP_P((
-       LDAPDN dn, struct berval *bv, unsigned flags, void *ctx ));
-
 LDAP_F( int )
 ldap_dn2str LDAP_P((
        LDAPDN dn,
@@ -1303,11 +1293,6 @@ ldap_bv2rdn LDAP_P((
        char **next,
        unsigned flags ));
 
-LDAP_F( int )
-ldap_bv2rdn_x LDAP_P((
-       struct berval *bv, LDAPRDN *rdn, char **next,
-       unsigned flags, void *ctx ));
-
 LDAP_F( int )
 ldap_str2rdn LDAP_P((
        LDAP_CONST char *str,
@@ -1321,10 +1306,6 @@ ldap_rdn2bv LDAP_P((
        struct berval *bv,
        unsigned flags ));
 
-LDAP_F( int )
-ldap_rdn2bv_x LDAP_P((
-       LDAPRDN rdn, struct berval *bv, unsigned flags, void *ctx ));
-
 LDAP_F( int )
 ldap_rdn2str LDAP_P((
        LDAPRDN rdn,

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index f2635512c5c940b5ffb045fe584bc08421dd3942..214c50be6a054d593468b12b70f30709af33434b 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -109,6 +109,22 @@ LDAP_F( char * )
 ldap_charray2str LDAP_P((
        char **array, const char* sep ));
 
+/* getdn.c */
+
+#ifdef LDAP_AVA_NULL   /* in ldap.h */
+LDAP_F( void ) ldap_rdnfree_x LDAP_P(( LDAPRDN rdn, void *ctx ));
+LDAP_F( void ) ldap_dnfree_x LDAP_P(( LDAPDN dn, void *ctx ));
+
+LDAP_F( int ) ldap_bv2dn_x LDAP_P(( 
+       struct berval *bv, LDAPDN *dn, unsigned flags, void *ctx ));
+LDAP_F( int ) ldap_dn2bv_x LDAP_P(( 
+       LDAPDN dn, struct berval *bv, unsigned flags, void *ctx ));
+LDAP_F( int ) ldap_bv2rdn_x LDAP_P(( 
+       struct berval *, LDAPRDN *, char **, unsigned flags, void *ctx ));
+LDAP_F( int ) ldap_rdn2bv_x LDAP_P(( 
+       LDAPRDN rdn, struct berval *bv, unsigned flags, void *ctx ));
+#endif
+
 /* url.c */
 LDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s ));