Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

[openldap] / libraries / libldap / request.c

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 133e42fd10a449c6142691afa5ce9f1c97e18a5c..07da8e9bcec79d63a8c3a8c9dc862afc6082c72f 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -29,11 +30,14 @@ static void use_connection LDAP_P(( LDAP *ld, LDAPConn *lc ));
 static void free_servers LDAP_P(( LDAPServer *srvlist ));
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
-static LDAPServer *dn2servers LDAP_P(( LDAP *ld, char *dn ));
+static LDAPServer *dn2servers LDAP_P(( LDAP *ld, const char *dn ));
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_DNS */
 
-static BerElement *re_encode_request LDAP_P(( LDAP *ld, BerElement *origber,
-    int msgid, char **dnp ));
+static BerElement *re_encode_request LDAP_P((
+       LDAP *ld,
+       BerElement *origber,
+    ber_int_t msgid,
+       char **dnp ));
 
 
 BerElement *
@@ -41,7 +45,7 @@ ldap_alloc_ber_with_options( LDAP *ld )
 {
        BerElement      *ber;
 
-    if (( ber = ber_alloc_t( ld->ld_lberoptions )) == NULLBER ) {
+    if (( ber = ber_alloc_t( ld->ld_lberoptions )) == NULL ) {
                ld->ld_errno = LDAP_NO_MEMORY;
 #ifdef STR_TRANSLATION
        } else {
@@ -67,10 +71,10 @@ ldap_set_ber_options( LDAP *ld, BerElement *ber )
 }
 
 
-int
+ber_int_t
 ldap_send_initial_request(
        LDAP *ld,
-       unsigned long msgtype,
+       ber_tag_t msgtype,
        const char *dn,
        BerElement *ber )
 {
@@ -111,7 +115,7 @@ ldap_send_initial_request(
 
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
-       if ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_DNS ))
+       if ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_DNS )
                && ldap_is_dns_dn( dn ) )
        {
                if (( servers = dn2servers( ld, dn )) == NULL ) {
@@ -150,8 +154,14 @@ ldap_send_initial_request(
 
 
 int
-ldap_send_server_request( LDAP *ld, BerElement *ber, int msgid, LDAPRequest
-       *parentreq, LDAPServer *srvlist, LDAPConn *lc, int bind )
+ldap_send_server_request(
+       LDAP *ld,
+       BerElement *ber,
+       ber_int_t msgid,
+       LDAPRequest *parentreq,
+       LDAPServer *srvlist,
+       LDAPConn *lc,
+       int bind )
 {
        LDAPRequest     *lr;
        int incparent;
@@ -400,7 +410,7 @@ static void
 use_connection( LDAP *ld, LDAPConn *lc )
 {
        ++lc->lconn_refcnt;
-       lc->lconn_lastused = time( 0 );
+       lc->lconn_lastused = time( NULL );
 }
 
 
@@ -447,7 +457,7 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
                Debug( LDAP_DEBUG_TRACE, "ldap_free_connection: actually freed\n",
                    0, 0, 0 );
        } else {
-               lc->lconn_lastused = time( 0 );
+               lc->lconn_lastused = time( NULL );
                Debug( LDAP_DEBUG_TRACE, "ldap_free_connection: refcnt %d\n",
                    lc->lconn_refcnt, 0, 0 );
        }
@@ -505,18 +515,19 @@ ldap_dump_requests_and_responses( LDAP *ld )
        }
 
        fprintf( stderr, "** Response Queue:\n" );
-       if (( lm = ld->ld_responses ) == NULLMSG ) {
+       if (( lm = ld->ld_responses ) == NULL ) {
                fprintf( stderr, "   Empty\n" );
        }
-       for ( ; lm != NULLMSG; lm = lm->lm_next ) {
-               fprintf( stderr, " * msgid %d,  type %d\n",
-                   lm->lm_msgid, lm->lm_msgtype );
+       for ( ; lm != NULL; lm = lm->lm_next ) {
+               fprintf( stderr, " * msgid %d,  type %lu\n",
+                   lm->lm_msgid, (unsigned long) lm->lm_msgtype );
                if (( l = lm->lm_chain ) != NULL ) {
                        fprintf( stderr, "   chained responses:\n" );
-                       for ( ; l != NULLMSG; l = l->lm_chain ) {
+                       for ( ; l != NULL; l = l->lm_chain ) {
                                fprintf( stderr,
-                                   "  * msgid %d,  type %d\n",
-                                   l->lm_msgid, l->lm_msgtype );
+                                   "  * msgid %d,  type %lu\n",
+                                   l->lm_msgid,
+                                   (unsigned long) l->lm_msgtype );
                        }
                }
        }
@@ -775,20 +786,22 @@ ldap_append_referral( LDAP *ld, char **referralsp, char *s )
 
 
 static BerElement *
-re_encode_request( LDAP *ld, BerElement *origber, int msgid, char **dnp )
+re_encode_request( LDAP *ld, BerElement *origber, ber_int_t msgid, char **dnp )
 {
 /*
  * XXX this routine knows way too much about how the lber library works!
  */
-       unsigned long   along, tag;
-       long            ver;
+       ber_int_t       along;
+       ber_len_t       len;
+       ber_tag_t       tag;
+       ber_int_t       ver;
        int             rc;
        BerElement      tmpber, *ber;
        char            *orig_dn;
 
        Debug( LDAP_DEBUG_TRACE,
-           "re_encode_request: new msgid %d, new dn <%s>\n",
-           msgid, ( *dnp == NULL ) ? "NONE" : *dnp, 0 );
+           "re_encode_request: new msgid %ld, new dn <%s>\n",
+           (long) msgid, ( *dnp == NULL ) ? "NONE" : *dnp, 0 );
 
        tmpber = *origber;
 
@@ -797,17 +810,17 @@ re_encode_request( LDAP *ld, BerElement *origber, int msgid, char **dnp )
         * followed by a sequence that is tagged with the operation code
         */
        if ( ber_scanf( &tmpber, "{i", /*}*/ &along ) != LDAP_TAG_MSGID ||
-           ( tag = ber_skip_tag( &tmpber, &along )) == LBER_DEFAULT ) {
+           ( tag = ber_skip_tag( &tmpber, &len )) == LBER_DEFAULT ) {
                 ld->ld_errno = LDAP_DECODING_ERROR;
                return( NULL );
        }
 
-        if (( ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+        if (( ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                 return( NULL );
         }
 
        /* bind requests have a version number before the DN & other stuff */
-       if ( tag == LDAP_REQ_BIND && ber_get_int( &tmpber, (long *)&ver ) ==
+       if ( tag == LDAP_REQ_BIND && ber_get_int( &tmpber, &ver ) ==
            LBER_DEFAULT ) {
                 ld->ld_errno = LDAP_DECODING_ERROR;
                ber_free( ber, 1 );
@@ -858,7 +871,7 @@ re_encode_request( LDAP *ld, BerElement *origber, int msgid, char **dnp )
 
 
 LDAPRequest *
-ldap_find_request_by_msgid( LDAP *ld, int msgid )
+ldap_find_request_by_msgid( LDAP *ld, ber_int_t msgid )
 {
        LDAPRequest     *lr;
 
@@ -874,9 +887,10 @@ ldap_find_request_by_msgid( LDAP *ld, int msgid )
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
 static LDAPServer *
-dn2servers( LDAP *ld, char *dn )       /* dn can also be a domain.... */
+dn2servers( LDAP *ld, const char *dn ) /* dn can also be a domain.... */
 {
-       char            *p, *domain, *host, *server_dn, **dxs;
+       char            *p, *host, *server_dn, **dxs;
+       const char *domain;
        int             i, port;
        LDAPServer      *srvlist, *prevsrv, *srv;
 
@@ -894,7 +908,7 @@ dn2servers( LDAP *ld, char *dn )    /* dn can also be a domain.... */
        srvlist = NULL;
 
        for ( i = 0; dxs[ i ] != NULL; ++i ) {
-               port = openldap_ldap_global_options.ldo_defport;
+               port = ldap_int_global_options.ldo_defport;
                server_dn = NULL;
                if ( strchr( dxs[ i ], ':' ) == NULL ) {
                        host = dxs[ i ];