From 4641cb8d932a7c15340bf2e0ea932a9fccd1926f Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 27 Jul 2005 15:15:31 +0000 Subject: [PATCH] Implement ldap_perror, ldap_result2error and LdapMapErrorToWin32. --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/error.c | 174 +++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.spec | 4 +- 4 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 dlls/wldap32/error.c diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 036b2d33714..f17a4ba3851 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -10,6 +10,7 @@ EXTRALIBS = @LDAPLIBS@ C_SRCS = \ ber.c \ bind.c \ + error.c \ init.c \ main.c \ search.c diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c new file mode 100644 index 00000000000..8a76816a61b --- /dev/null +++ b/dlls/wldap32/error.c @@ -0,0 +1,174 @@ +/* + * WLDAP32 - LDAP support for Wine + * + * Copyright 2005 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include "wine/port.h" +#include "wine/debug.h" + +#include + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +#ifdef HAVE_LDAP_H +#include +#else +#define LDAP_SUCCESS 0x00 +#define LDAP_NOT_SUPPORTED 0x5c +#endif + +#include "winldap_private.h" +#include "wldap32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wldap32); + +/* + * NOTES: does nothing + */ +void WLDAP32_ldap_perror( WLDAP32_LDAP *ld, const PCHAR msg ) +{ + TRACE( "(%p, %s)\n", ld, debugstr_a(msg) ); +} + +ULONG WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULONG free ) +{ + ULONG ret = LDAP_NOT_SUPPORTED; +#ifdef HAVE_LDAP + + TRACE( "(%p, %p, 0x%08lx)\n", ld, res, free ); + + if (!ld) return ~0UL; + ret = ldap_result2error( ld, res, free ); + +#endif + return ret; +} + +static const ULONG WLDAP32_errormap[] = { + /* LDAP_SUCCESS */ ERROR_SUCCESS, + /* LDAP_OPERATIONS_ERROR */ ERROR_OPEN_FAILED, + /* LDAP_PROTOCOL_ERROR */ ERROR_INVALID_LEVEL, + /* LDAP_TIMELIMIT_EXCEEDED */ ERROR_TIMEOUT, + /* LDAP_SIZELIMIT_EXCEEDED */ ERROR_MORE_DATA, + /* LDAP_COMPARE_FALSE */ ERROR_DS_GENERIC_ERROR, + /* LDAP_COMPARE_TRUE */ ERROR_DS_GENERIC_ERROR, + /* LDAP_AUTH_METHOD_NOT_SUPPORTED */ ERROR_ACCESS_DENIED, + /* LDAP_STRONG_AUTH_REQUIRED */ ERROR_ACCESS_DENIED, + /* LDAP_REFERRAL_V2 */ ERROR_MORE_DATA, + /* LDAP_REFERRAL */ ERROR_MORE_DATA, + /* LDAP_ADMIN_LIMIT_EXCEEDED */ ERROR_NOT_ENOUGH_QUOTA, + /* LDAP_UNAVAILABLE_CRIT_EXTENSION */ ERROR_CAN_NOT_COMPLETE, + /* LDAP_CONFIDENTIALITY_REQUIRED */ ERROR_DS_GENERIC_ERROR, + /* LDAP_SASL_BIND_IN_PROGRESS */ ERROR_DS_GENERIC_ERROR, + /* 0x0f */ ERROR_DS_GENERIC_ERROR, + /* LDAP_NO_SUCH_ATTRIBUTE */ ERROR_INVALID_PARAMETER, + /* LDAP_UNDEFINED_TYPE */ ERROR_DS_GENERIC_ERROR, + /* LDAP_INAPPROPRIATE_MATCHING */ ERROR_INVALID_PARAMETER, + /* LDAP_CONSTRAINT_VIOLATION */ ERROR_INVALID_PARAMETER, + /* LDAP_ATTRIBUTE_OR_VALUE_EXISTS */ ERROR_ALREADY_EXISTS, + /* LDAP_INVALID_SYNTAX */ ERROR_INVALID_NAME, + /* 0x16 */ ERROR_DS_GENERIC_ERROR, + /* 0x17 */ ERROR_DS_GENERIC_ERROR, + /* 0x18 */ ERROR_DS_GENERIC_ERROR, + /* 0x19 */ ERROR_DS_GENERIC_ERROR, + /* 0x1a */ ERROR_DS_GENERIC_ERROR, + /* 0x1b */ ERROR_DS_GENERIC_ERROR, + /* 0x1c */ ERROR_DS_GENERIC_ERROR, + /* 0x1d */ ERROR_DS_GENERIC_ERROR, + /* 0x1e */ ERROR_DS_GENERIC_ERROR, + /* 0x1f */ ERROR_DS_GENERIC_ERROR, + /* LDAP_NO_SUCH_OBJECT */ ERROR_FILE_NOT_FOUND, + /* LDAP_ALIAS_PROBLEM */ ERROR_DS_GENERIC_ERROR, + /* LDAP_INVALID_DN_SYNTAX */ ERROR_INVALID_PARAMETER, + /* LDAP_IS_LEAF */ ERROR_DS_GENERIC_ERROR, + /* LDAP_ALIAS_DEREF_PROBLEM */ ERROR_DS_GENERIC_ERROR, + /* 0x25 */ ERROR_DS_GENERIC_ERROR, + /* 0x26 */ ERROR_DS_GENERIC_ERROR, + /* 0x27 */ ERROR_DS_GENERIC_ERROR, + /* 0x28 */ ERROR_DS_GENERIC_ERROR, + /* 0x29 */ ERROR_DS_GENERIC_ERROR, + /* 0x2a */ ERROR_DS_GENERIC_ERROR, + /* 0x2b */ ERROR_DS_GENERIC_ERROR, + /* 0x2c */ ERROR_DS_GENERIC_ERROR, + /* 0x2d */ ERROR_DS_GENERIC_ERROR, + /* 0x2e */ ERROR_DS_GENERIC_ERROR, + /* 0x2f */ ERROR_DS_GENERIC_ERROR, + /* LDAP_INAPPROPRIATE_AUTH */ ERROR_ACCESS_DENIED, + /* LDAP_INVALID_CREDENTIALS */ ERROR_WRONG_PASSWORD, + /* LDAP_INSUFFICIENT_RIGHTS */ ERROR_ACCESS_DENIED, + /* LDAP_BUSY */ ERROR_BUSY, + /* LDAP_UNAVAILABLE */ ERROR_DEV_NOT_EXIST, + /* LDAP_UNWILLING_TO_PERFORM */ ERROR_CAN_NOT_COMPLETE, + /* LDAP_LOOP_DETECT */ ERROR_DS_GENERIC_ERROR, + /* 0x37 */ ERROR_DS_GENERIC_ERROR, + /* 0x38 */ ERROR_DS_GENERIC_ERROR, + /* 0x39 */ ERROR_DS_GENERIC_ERROR, + /* 0x3a */ ERROR_DS_GENERIC_ERROR, + /* 0x3b */ ERROR_DS_GENERIC_ERROR, + /* LDAP_SORT_CONTROL_MISSING */ 8261, + /* LDAP_OFFSET_RANGE_ERROR */ 8262, + /* 0x3e */ ERROR_DS_GENERIC_ERROR, + /* 0x3f */ ERROR_DS_GENERIC_ERROR, + /* LDAP_NAMING_VIOLATION */ ERROR_INVALID_PARAMETER, + /* LDAP_OBJECT_CLASS_VIOLATION */ ERROR_INVALID_PARAMETER, + /* LDAP_NOT_ALLOWED_ON_NONLEAF */ ERROR_CAN_NOT_COMPLETE, + /* LDAP_NOT_ALLOWED_ON_RDN */ ERROR_ACCESS_DENIED, + /* LDAP_ALREADY_EXISTS */ ERROR_ALREADY_EXISTS, + /* LDAP_NO_OBJECT_CLASS_MODS */ ERROR_ACCESS_DENIED, + /* LDAP_RESULTS_TOO_LARGE */ ERROR_INSUFFICIENT_BUFFER, + /* LDAP_AFFECTS_MULTIPLE_DSAS */ ERROR_CAN_NOT_COMPLETE, + /* 0x48 */ ERROR_DS_GENERIC_ERROR, + /* 0x49 */ ERROR_DS_GENERIC_ERROR, + /* 0x4a */ ERROR_DS_GENERIC_ERROR, + /* 0x4b */ ERROR_DS_GENERIC_ERROR, + /* LDAP_VIRTUAL_LIST_VIEW_ERROR */ ERROR_DS_GENERIC_ERROR, + /* 0x4d */ ERROR_DS_GENERIC_ERROR, + /* 0x4e */ ERROR_DS_GENERIC_ERROR, + /* 0x4f */ ERROR_DS_GENERIC_ERROR, + /* LDAP_OTHER */ ERROR_DS_GENERIC_ERROR, + /* LDAP_SERVER_DOWN */ ERROR_BAD_NET_RESP, + /* LDAP_LOCAL_ERROR */ ERROR_DS_GENERIC_ERROR, + /* LDAP_ENCODING_ERROR */ ERROR_UNEXP_NET_ERR, + /* LDAP_DECODING_ERROR */ ERROR_UNEXP_NET_ERR, + /* LDAP_TIMEOUT */ ERROR_SERVICE_REQUEST_TIMEOUT, + /* LDAP_AUTH_UNKNOWN */ ERROR_WRONG_PASSWORD, + /* LDAP_FILTER_ERROR */ ERROR_INVALID_PARAMETER, + /* LDAP_USER_CANCELLED */ ERROR_CANCELLED, + /* LDAP_PARAM_ERROR */ ERROR_INVALID_PARAMETER, + /* LDAP_NO_MEMORY */ ERROR_NOT_ENOUGH_MEMORY, + /* LDAP_CONNECT_ERROR */ ERROR_CONNECTION_REFUSED, + /* LDAP_NOT_SUPPORTED */ ERROR_CAN_NOT_COMPLETE, + /* LDAP_CONTROL_NOT_FOUND */ ERROR_NOT_FOUND, + /* LDAP_NO_RESULTS_RETURNED */ ERROR_MORE_DATA, + /* LDAP_MORE_RESULTS_TO_RETURN */ ERROR_MORE_DATA, + /* LDAP_CLIENT_LOOP */ ERROR_DS_GENERIC_ERROR, + /* LDAP_REFERRAL_LIMIT_EXCEEDED */ ERROR_DS_GENERIC_ERROR +}; + +ULONG LdapMapErrorToWin32( ULONG err ) +{ + TRACE( "(0x%08lx)\n", err ); + + if (err > sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) + return ERROR_DS_GENERIC_ERROR; + return WLDAP32_errormap[err]; +} diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 1f4be8f56b0..8b20a193638 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -124,6 +124,8 @@ WLDAP32_LDAP *ldap_initA(const PCHAR,ULONG); WLDAP32_LDAP *ldap_initW(const PWCHAR,ULONG); WLDAP32_LDAP *ldap_openA(PCHAR,ULONG); WLDAP32_LDAP *ldap_openW(PWCHAR,ULONG); +void WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR); +ULONG WLDAP32_ldap_result2error(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG); ULONG ldap_sasl_bindA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,int*); ULONG ldap_sasl_bindW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,int*); ULONG ldap_sasl_bind_sA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*); diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index ad64056abd2..45076a523a3 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -1,5 +1,5 @@ @ stub LdapGetLastError -@ stub LdapMapErrorToWin32 +@ cdecl LdapMapErrorToWin32(long) @ cdecl ber_alloc_t(long) @ cdecl ber_bvdup(ptr) @ cdecl ber_bvecfree(ptr) @@ -25,6 +25,8 @@ @ cdecl ldap_open(str long) ldap_openA @ cdecl ldap_openA(str long) @ cdecl ldap_openW(wstr long) +@ cdecl ldap_perror(ptr ptr) WLDAP32_ldap_perror +@ cdecl ldap_result2error(ptr ptr long) WLDAP32_ldap_result2error @ cdecl ldap_sasl_bindA(ptr str str ptr ptr ptr ptr) @ cdecl ldap_sasl_bindW(ptr wstr wstr ptr ptr ptr ptr) @ cdecl ldap_sasl_bind_sA(ptr str str ptr ptr ptr ptr) -- 2.11.4.GIT