bug fixes for ldap_msgtype and ldap_msgid

[openldap] / libraries / libldap / options.c

diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index c66ac0ab1fe74bbeee600d03b6d9025c66ea195d..27d7c2db3aaf4dbe3b7a48dee5505d9a8ac2a325 100644 (file)
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -79,11 +80,11 @@ static const LDAPAPIFeatureInfo features[] = {
 
 int
 ldap_get_option(
-       LDAP_CONST LDAP *ld,
+       LDAP    *ld,
        int             option,
        void    *outvalue)
 {
-       LDAP_CONST struct ldapoptions *lo;
+       const struct ldapoptions *lo;
 
        if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
                ldap_int_initialize();
@@ -381,7 +382,7 @@ ldap_set_option(
 
        case LDAP_OPT_TIMEOUT: {
                        const struct timeval *tv = 
-                               (struct timeval *) invalue;
+                               (const struct timeval *) invalue;
 
                        if ( lo->ldo_tm_api != NULL ) {
                                LDAP_FREE( lo->ldo_tm_api );
@@ -395,7 +396,7 @@ ldap_set_option(
 
        case LDAP_OPT_NETWORK_TIMEOUT: {
                        const struct timeval *tv = 
-                               (struct timeval *) invalue;
+                               (const struct timeval *) invalue;
 
                        if ( lo->ldo_tm_net != NULL ) {
                                LDAP_FREE( lo->ldo_tm_net );