Move serverID into a Global configuration section.

[openldap] / libraries / libldap / whoami.c

diff --git a/libraries/libldap/whoami.c b/libraries/libldap/whoami.c
index f44e1d2caf1c8613bc13ef81c1c6405f9f6d91db..4dac856a0fe7add26e68cc05fbbab3778c4657d9 100644 (file)
--- a/libraries/libldap/whoami.c
+++ b/libraries/libldap/whoami.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,6 +12,10 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
+/* ACKNOWLEDGEMENTS:
+ * This program was orignally developed by Kurt D. Zeilenga for inclusion in
+ * OpenLDAP Software.
+ */
 
 #include "portable.h"
 
@@ -64,7 +68,7 @@ ldap_whoami( LDAP *ld,
        assert( LDAP_VALID( ld ) );
        assert( msgidp != NULL );
 
-       rc = ldap_extended_operation( ld, LDAP_EXOP_X_WHO_AM_I,
+       rc = ldap_extended_operation( ld, LDAP_EXOP_WHO_AM_I,
                NULL, sctrls, cctrls, msgidp );
 
        return rc;
@@ -84,7 +88,7 @@ ldap_whoami_s(
        rc = ldap_whoami( ld, sctrls, cctrls, &msgid );
        if ( rc != LDAP_SUCCESS ) return rc;
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
                return ld->ld_errno;
        }