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 1b5f28624210a93e5f2c72e6a263840775ef0a6e..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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,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;
@@ -88,7 +88,7 @@ ldap_whoami_s(
        rc = ldap_whoami( ld, sctrls, cctrls, &msgid );
        if ( rc != LDAP_SUCCESS ) return rc;
 
-       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
                return ld->ld_errno;
        }