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 da17e273bf3fb5d1f152e7823b0df3aa911a2c5d..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,7 +30,7 @@ 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((
@@ -114,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 ) {
@@ -518,14 +519,15 @@ ldap_dump_requests_and_responses( LDAP *ld )
                fprintf( stderr, "   Empty\n" );
        }
        for ( ; lm != NULL; lm = lm->lm_next ) {
-               fprintf( stderr, " * msgid %d,  type %d\n",
-                   lm->lm_msgid, lm->lm_msgtype );
+               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 != 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 );
                        }
                }
        }
@@ -885,9 +887,10 @@ ldap_find_request_by_msgid( LDAP *ld, ber_int_t 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;
 
@@ -905,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 ];