Add LDAP_DEPRECATED macro

Need to remove use of deprecated functions.

diff --git a/clients/tools/common.c b/clients/tools/common.c
index e6dac28c8c524b4ece04381d4dec0ba5c4ec423d..fb7d1cb03813fe6198a179b8beddf8a0952f5c84 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -32,6 +32,7 @@
 #include <ac/unistd.h>
 #include <ac/errno.h>
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #include "lutil_ldap.h"

diff --git a/include/ldap.h b/include/ldap.h
index 3bb861e6ee207cea3ed9ef11f0f4ddbfb03f46a0..045ae58348f8eb4a94ad91c6c63c1d3753802c9d 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -698,10 +698,12 @@ ldap_abandon_ext LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_abandon LDAP_P((  /* deprecated */
        LDAP *ld,
        int msgid ));
+#endif
 
 
 /*
@@ -724,6 +726,7 @@ ldap_add_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_add LDAP_P((      /* deprecated */
        LDAP *ld,
@@ -735,6 +738,7 @@ ldap_add_s LDAP_P(( /* deprecated */
        LDAP *ld,
        LDAP_CONST char *dn,
        LDAPMod **attrs ));
+#endif
 
 
 /*
@@ -797,6 +801,7 @@ ldap_parse_sasl_bind_result LDAP_P((
        struct berval   **servercredp,
        int                             freeit ));
 
+#ifdef LDAP_DEPRECATED
 /*
  * in bind.c:
  *     (deprecated)
@@ -819,13 +824,13 @@ ldap_bind_s LDAP_P((      /* deprecated */
  * in sbind.c:
  */
 LDAP_F( int )
-ldap_simple_bind LDAP_P((
+ldap_simple_bind LDAP_P(( /* deprecated */
        LDAP *ld,
        LDAP_CONST char *who,
        LDAP_CONST char *passwd ));
 
 LDAP_F( int )
-ldap_simple_bind_s LDAP_P((
+ldap_simple_bind_s LDAP_P(( /* deprecated */
        LDAP *ld,
        LDAP_CONST char *who,
        LDAP_CONST char *passwd ));
@@ -859,6 +864,7 @@ LDAP_F( int )
 ldap_kerberos_bind2_s LDAP_P(( /* deprecated */
        LDAP *ld,
        LDAP_CONST char *who ));
+#endif
 
 
 /*
@@ -901,6 +907,7 @@ ldap_compare_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_compare LDAP_P((  /* deprecated */
        LDAP *ld,
@@ -914,6 +921,7 @@ ldap_compare_s LDAP_P((     /* deprecated */
        LDAP_CONST char *dn,
        LDAP_CONST char *attr,
        LDAP_CONST char *value ));
+#endif
 
 
 /*
@@ -934,6 +942,7 @@ ldap_delete_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_delete LDAP_P((   /* deprecated */
        LDAP *ld,
@@ -943,6 +952,7 @@ LDAP_F( int )
 ldap_delete_s LDAP_P(( /* deprecated */
        LDAP *ld,
        LDAP_CONST char *dn ));
+#endif
 
 
 /*
@@ -963,6 +973,7 @@ LDAP_F( char * )
 ldap_err2string LDAP_P((
        int err ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_result2error LDAP_P((     /* deprecated */
        LDAP *ld,
@@ -973,6 +984,7 @@ LDAP_F( void )
 ldap_perror LDAP_P((   /* deprecated */
        LDAP *ld,
        LDAP_CONST char *s ));
+#endif
 
 
 /*
@@ -995,6 +1007,7 @@ ldap_modify_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_modify LDAP_P((   /* deprecated */
        LDAP *ld,
@@ -1006,6 +1019,7 @@ ldap_modify_s LDAP_P((    /* deprecated */
        LDAP *ld,
        LDAP_CONST char *dn,
        LDAPMod **mods ));
+#endif
 
 
 /*
@@ -1032,6 +1046,7 @@ ldap_rename_s LDAP_P((
        LDAPControl **sctrls,
        LDAPControl **cctrls ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_rename2 LDAP_P((  /* deprecated */
        LDAP *ld,
@@ -1073,13 +1088,15 @@ ldap_modrdn2_s LDAP_P(( /* deprecated */
        LDAP_CONST char *dn,
        LDAP_CONST char *newrdn,
        int deleteoldrdn));
+#endif
 
 
 /*
  * in open.c:
  */
+#ifdef LDAP_DEPRECATED
 LDAP_F( LDAP * )
-ldap_init LDAP_P((
+ldap_init LDAP_P(( /* deprecated */
        LDAP_CONST char *host,
        int port ));
 
@@ -1087,6 +1104,7 @@ LDAP_F( LDAP * )
 ldap_open LDAP_P((     /* deprecated */
        LDAP_CONST char *host,
        int port ));
+#endif
 
 LDAP_F( int )
 ldap_create LDAP_P((
@@ -1358,6 +1376,7 @@ LDAP_F( void )
 ldap_value_free_len LDAP_P((
        struct berval **vals ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( char ** )
 ldap_get_values LDAP_P((       /* deprecated */
        LDAP *ld,
@@ -1371,6 +1390,7 @@ ldap_count_values LDAP_P((        /* deprecated */
 LDAP_F( void )
 ldap_value_free LDAP_P((       /* deprecated */
        char **vals ));
+#endif
 
 /*
  * in result.c:
@@ -1432,6 +1452,7 @@ ldap_search_ext_s LDAP_P((
        int                             sizelimit,
        LDAPMessage             **res ));
 
+#ifdef LDAP_DEPRECATED
 LDAP_F( int )
 ldap_search LDAP_P((   /* deprecated */
        LDAP *ld,
@@ -1461,19 +1482,12 @@ ldap_search_st LDAP_P(( /* deprecated */
        int attrsonly,
        struct timeval *timeout,
        LDAPMessage **res ));
+#endif
 
 /*
  * in unbind.c
  */
 LDAP_F( int )
-ldap_unbind LDAP_P(( /* deprecated */
-       LDAP *ld ));
-
-LDAP_F( int )
-ldap_unbind_s LDAP_P(( /* deprecated */
-       LDAP *ld ));
-
-LDAP_F( int )
 ldap_unbind_ext LDAP_P((
        LDAP                    *ld,
        LDAPControl             **serverctrls,
@@ -1485,6 +1499,16 @@ ldap_unbind_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls));
 
+#ifdef LDAP_DEPRECATED
+LDAP_F( int )
+ldap_unbind LDAP_P(( /* deprecated */
+       LDAP *ld ));
+
+LDAP_F( int )
+ldap_unbind_s LDAP_P(( /* deprecated */
+       LDAP *ld ));
+#endif
+
 /*
  * in filter.c
  */
@@ -1529,6 +1553,7 @@ ldap_mods_free LDAP_P((
        int freemods ));
 
 
+#ifdef LDAP_DEPRECATED
 /*
  * in sort.c (deprecated)
  */
@@ -1556,6 +1581,7 @@ LDAP_F( int ) /* deprecated */
 ldap_sort_strcasecmp LDAP_P((
        LDAP_CONST void *a,
        LDAP_CONST void *b ));
+#endif
 
 /*
  * in url.c

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 44c28002b7efdfb91889e3d3e26bcb8649738f26..02523bf0b74e6be0029bf53fb6e6d415de36c1f8 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -56,7 +56,7 @@
         *  Note: Deallocate structure when the process exits
         */
 #      define LDAP_INT_GLOBAL_OPT() ldap_int_global_opt()
-   struct ldapoptions *ldap_int_global_opt(void);
+       struct ldapoptions *ldap_int_global_opt(void);
 #else
 #      define LDAP_INT_GLOBAL_OPT() (&ldap_int_global_options)
 #endif
@@ -84,6 +84,7 @@
 
 #endif /* LDAP_DEBUG */
 
+#define LDAP_DEPRECATED 1
 #include "ldap.h"
 
 #include "ldap_pvt.h"

diff --git a/libraries/librewrite/ldapmap.c b/libraries/librewrite/ldapmap.c
index 523d5c5cbd79b77f9159194c0c2b389e395df162..99c0498c66c72c16131c6235e958bc8cf9eca2a4 100644 (file)
--- a/libraries/librewrite/ldapmap.c
+++ b/libraries/librewrite/ldapmap.c
@@ -19,6 +19,7 @@
 
 #include <portable.h>
 
+#define LDAP_DEPRECATED 1
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 

diff --git a/libraries/librewrite/xmap.c b/libraries/librewrite/xmap.c
index 876c4dadea45a659ed894e665c9f09c5f8ee531e..93bf53304b6b25cb0cc062d02fe1d7824edc0987 100644 (file)
--- a/libraries/librewrite/xmap.c
+++ b/libraries/librewrite/xmap.c
@@ -25,6 +25,7 @@
 #include <pwd.h>
 #endif
 
+#define LDAP_DEPRECATED 1
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 3799463ac29a4cb1d3bfb30c5c0dcc4fb1152690..868f31ae42a317d06c7bbe9e7a7621f8cfb7dad3 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -46,6 +46,7 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include "lutil_ldap.h"
 #include "slurp.h"

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index 86f39b822c72d2687e3745d69dd3a260b216b0e0..78860f01f1d22c7ce84ce7e6cc1a59f027edfe28 100644 (file)
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -30,6 +30,7 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #define LOOPS  100

diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c
index 26082d99a6d33474a10656d856ff0d1a44d0282a..4da9fa1d81f549ecfe95b5f6876695bb6184b4d6 100644 (file)
--- a/tests/progs/slapd-modrdn.c
+++ b/tests/progs/slapd-modrdn.c
@@ -30,6 +30,7 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #define LOOPS  100

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index b2cb3f8b95f4e574357e9d090430bcf03d1a927b..0b75733ad03631f54d71294487794e5cb73e4ab7 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -30,6 +30,7 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #define LOOPS  100

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 5d09afc1f3a8e9226d5b9671bfb8c3af778ed29b..182f14f6998e983cc3c0fcabd6b1791996d278f9 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -30,7 +30,7 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 #define LOOPS  100