Merged LDAPworldCurrent (P1-10,13,15,16,19-22)

[openldap] / libraries / libldap / ldap-int.h

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 10adbe91ff7fdd143e69252e46e479f2790dee39..e841a35b5bbadfbe86c2ff40bf338e51cfaee824 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -27,14 +27,14 @@
  * in cache.c
  */
 #ifdef NEEDPROTOS
-void add_request_to_cache( LDAP *ld, unsigned long msgtype,
+void ldap_add_request_to_cache( LDAP *ld, unsigned long msgtype,
         BerElement *request );
-void add_result_to_cache( LDAP *ld, LDAPMessage *result );
-int check_cache( LDAP *ld, unsigned long msgtype, BerElement *request );
+void ldap_add_result_to_cache( LDAP *ld, LDAPMessage *result );
+int ldap_check_cache( LDAP *ld, unsigned long msgtype, BerElement *request );
 #else /* NEEDPROTOS */
-void add_request_to_cache();
-void add_result_to_cache();
-int check_cache();
+void ldap_add_request_to_cache();
+void ldap_add_result_to_cache();
+int ldap_check_cache();
 #endif /* NEEDPROTOS */
 
 
@@ -43,10 +43,10 @@ int check_cache();
  * in kerberos.c
  */
 #ifdef NEEDPROTOS
-char *get_kerberosv4_credentials( LDAP *ld, char *who, char *service,
+char *ldap_get_kerberosv4_credentials( LDAP *ld, char *who, char *service,
         int *len );
 #else /* NEEDPROTOS */
-char *get_kerberosv4_credentials();
+char *ldap_get_kerberosv4_credentials();
 #endif /* NEEDPROTOS */
 
 #endif /* KERBEROS */
@@ -67,17 +67,17 @@ int open_ldap_connection();
  * in os-ip.c
  */
 #ifdef NEEDPROTOS
-int connect_to_host( Sockbuf *sb, char *host, unsigned long address, int port,
+int ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, int port,
        int async );
-void close_connection( Sockbuf *sb );
+void ldap_close_connection( Sockbuf *sb );
 #else /* NEEDPROTOS */
-int connect_to_host();
-void close_connection();
+int ldap_connect_to_host();
+void ldap_close_connection();
 #endif /* NEEDPROTOS */
 
 #ifdef KERBEROS
 #ifdef NEEDPROTOS
-char *host_connected_to( Sockbuf *sb );
+char *ldap_host_connected_to( Sockbuf *sb );
 #else /* NEEDPROTOS */
 char *host_connected_to();
 #endif /* NEEDPROTOS */
@@ -86,22 +86,22 @@ char *host_connected_to();
 #ifdef LDAP_REFERRALS
 #ifdef NEEDPROTOS
 int do_ldap_select( LDAP *ld, struct timeval *timeout );
-void *new_select_info( void );
-void free_select_info( void *sip );
-void mark_select_write( LDAP *ld, Sockbuf *sb );
-void mark_select_read( LDAP *ld, Sockbuf *sb );
-void mark_select_clear( LDAP *ld, Sockbuf *sb );
-int is_read_ready( LDAP *ld, Sockbuf *sb );
-int is_write_ready( LDAP *ld, Sockbuf *sb );
+void *ldap_new_select_info( void );
+void ldap_free_select_info( void *sip );
+void ldap_mark_select_write( LDAP *ld, Sockbuf *sb );
+void ldap_mark_select_read( LDAP *ld, Sockbuf *sb );
+void ldap_mark_select_clear( LDAP *ld, Sockbuf *sb );
+int ldap_is_read_ready( LDAP *ld, Sockbuf *sb );
+int ldap_is_write_ready( LDAP *ld, Sockbuf *sb );
 #else /* NEEDPROTOS */
 int do_ldap_select();
-void *new_select_info();
-void free_select_info();
-void mark_select_write();
-void mark_select_read();
-void mark_select_clear();
-int is_read_ready();
-int is_write_ready();
+void *ldap_new_select_info();
+void ldap_free_select_info();
+void ldap_mark_select_write();
+void ldap_mark_select_read();
+void ldap_mark_select_clear();
+int ldap_is_read_ready();
+int ldap_is_write_ready();
 #endif /* NEEDPROTOS */
 #endif /* LDAP_REFERRALS */
 
@@ -110,46 +110,46 @@ int is_write_ready();
  * in request.c
  */
 #ifdef NEEDPROTOS
-int send_initial_request( LDAP *ld, unsigned long msgtype,
+int ldap_send_initial_request( LDAP *ld, unsigned long msgtype,
        char *dn, BerElement *ber );
-BerElement *alloc_ber_with_options( LDAP *ld );
-void set_ber_options( LDAP *ld, BerElement *ber );
+BerElement *ldap_alloc_ber_with_options( LDAP *ld );
+void ldap_set_ber_options( LDAP *ld, BerElement *ber );
 #else /* NEEDPROTOS */
-int send_initial_request();
-BerElement *alloc_ber_with_options();
-void set_ber_options();
+int ldap_send_initial_request();
+BerElement *ldap_alloc_ber_with_options();
+void ldap_set_ber_options();
 #endif /* NEEDPROTOS */
 
 #if defined( LDAP_REFERRALS ) || defined( LDAP_DNS )
 #ifdef NEEDPROTOS
-int send_server_request( LDAP *ld, BerElement *ber, int msgid,
+int ldap_send_server_request( LDAP *ld, BerElement *ber, int msgid,
        LDAPRequest *parentreq, LDAPServer *srvlist, LDAPConn *lc,
        int bind );
-LDAPConn *new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
+LDAPConn *ldap_new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
        int connect, int bind );
-LDAPRequest *find_request_by_msgid( LDAP *ld, int msgid );
-void free_request( LDAP *ld, LDAPRequest *lr );
-void free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind );
-void dump_connection( LDAP *ld, LDAPConn *lconns, int all );
-void dump_requests_and_responses( LDAP *ld );
+LDAPRequest *ldap_find_request_by_msgid( LDAP *ld, int msgid );
+void ldap_free_request( LDAP *ld, LDAPRequest *lr );
+void ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind );
+void ldap_dump_connection( LDAP *ld, LDAPConn *lconns, int all );
+void ldap_dump_requests_and_responses( LDAP *ld );
 #else /* NEEDPROTOS */
-int send_server_request();
-LDAPConn *new_connection();
-LDAPRequest *find_request_by_msgid();
-void free_request();
-void free_connection();
-void dump_connection();
-void dump_requests_and_responses();
+int ldap_send_server_request();
+LDAPConn *ldap_new_connection();
+LDAPRequest *ldap_find_request_by_msgid();
+void ldap_free_request();
+void ldap_free_connection();
+void ldap_dump_connection();
+void ldap_dump_requests_and_responses();
 #endif /* NEEDPROTOS */
 #endif /* LDAP_REFERRALS || LDAP_DNS */
 
 #ifdef LDAP_REFERRALS
 #ifdef NEEDPROTOS
-int chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp );
-int append_referral( LDAP *ld, char **referralsp, char *s );
+int ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp );
+int ldap_append_referral( LDAP *ld, char **referralsp, char *s );
 #else /* NEEDPROTOS */
-int chase_referrals();
-int append_referral();
+int ldap_chase_referrals();
+int ldap_append_referral();
 #endif /* NEEDPROTOS */
 #endif /* LDAP_REFERRALS */
 
@@ -170,10 +170,10 @@ BerElement *ldap_build_search_req();
  */
 #ifdef NEEDPROTOS
 int ldap_ld_free( LDAP *ld, int close );
-int send_unbind( LDAP *ld, Sockbuf *sb );
+int ldap_send_unbind( LDAP *ld, Sockbuf *sb );
 #else /* NEEDPROTOS */
 int ldap_ld_free();
-int send_unbind();
+int ldap_send_unbind();
 #endif /* NEEDPROTOS */
 
 
@@ -182,8 +182,31 @@ int send_unbind();
  * in getdxbyname.c
  */
 #ifdef NEEDPROTOS
-char **getdxbyname( char *domain );
+char **ldap_getdxbyname( char *domain );
 #else /* NEEDPROTOS */
-char **getdxbyname();
+char **ldap_getdxbyname();
 #endif /* NEEDPROTOS */
 #endif /* LDAP_DNS */
+
+#if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
+/*
+ * in charset.c
+ *
+ * added-in this stuff so that libldap.a would build, i.e. refs to 
+ * these routines from open.c would resolve. 
+ * hodges@stanford.edu 5-Feb-96
+ */
+#if LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET
+#ifdef NEEDPROTOS
+extern 
+int ldap_t61_to_8859( char **bufp, unsigned long *buflenp, int free_input );
+extern 
+int ldap_8859_to_t61( char **bufp, unsigned long *buflenp, int free_input );
+#else /* NEEDPROTOS */
+extern
+int ldap_t61_to_8859();
+extern
+int ldap_8859_to_t61();
+#endif /* NEEDPROTOS */
+#endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
+#endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */