wldap32: Implement some page handling functions.
Implement ldap_create_page_control{A,W} and ldap_parse_page_control{A,W}. Move the page handling functions into their own file.
This commit is contained in:
parent
4a047373a7
commit
bf2f5a8f17
|
@ -23,6 +23,7 @@ C_SRCS = \
|
|||
modify.c \
|
||||
modrdn.c \
|
||||
option.c \
|
||||
page.c \
|
||||
parse.c \
|
||||
rename.c \
|
||||
search.c \
|
||||
|
|
|
@ -121,49 +121,6 @@ ULONG ldap_controls_freeW( LDAPControlW **controls )
|
|||
return ret;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* ldap_create_page_controlA (WLDAP32.@)
|
||||
*
|
||||
* See ldap_create_page_controlW.
|
||||
*/
|
||||
ULONG ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
|
||||
struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlA *control )
|
||||
{
|
||||
FIXME( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
|
||||
critical, control );
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* ldap_create_page_controlW (WLDAP32.@)
|
||||
*
|
||||
* Create a control for paged search results.
|
||||
*
|
||||
* PARAMS
|
||||
* ld [I] Pointer to an LDAP context.
|
||||
* pagesize [I] Number of entries to return per page.
|
||||
* cookie [I] Used by the server to track its location in the
|
||||
* search results.
|
||||
* critical [I] Tells the server this control is critical to the
|
||||
* search operation.
|
||||
* control [O] LDAPControl created.
|
||||
*
|
||||
* RETURNS
|
||||
* Success: LDAP_SUCCESS
|
||||
* Failure: An LDAP error code.
|
||||
*
|
||||
* NOTES
|
||||
* Not implemented. It may be possible to implement this function
|
||||
* on top of ldap_create_vlv_control.
|
||||
*/
|
||||
ULONG ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
|
||||
struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control )
|
||||
{
|
||||
FIXME( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
|
||||
critical, control );
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* ldap_create_sort_controlA (WLDAP32.@)
|
||||
*
|
||||
|
|
|
@ -261,35 +261,6 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDAP32_LDA
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ULONG ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
|
||||
ULONG *message )
|
||||
{
|
||||
FIXME( "(%p, %p, 0x%08lx, %p)\n", ld, search, pagesize, message );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
|
||||
struct l_timeval *timeout, ULONG pagesize, ULONG *count,
|
||||
WLDAP32_LDAPMessage **results )
|
||||
{
|
||||
FIXME( "(%p, %p, %p, 0x%08lx, %p, %p)\n", ld, search, timeout,
|
||||
pagesize, count, results );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
|
||||
ULONG *count, WLDAP32_LDAPMessage *results )
|
||||
{
|
||||
FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
void ldap_memfreeA( PCHAR block )
|
||||
{
|
||||
TRACE( "(%p)\n", block );
|
||||
|
|
|
@ -0,0 +1,276 @@
|
|||
/*
|
||||
* 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 <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winnls.h"
|
||||
|
||||
#ifdef HAVE_LDAP_H
|
||||
#include <ldap.h>
|
||||
#else
|
||||
#define LDAP_SUCCESS 0x00
|
||||
#define LDAP_NOT_SUPPORTED 0x5c
|
||||
#endif
|
||||
|
||||
#include "winldap_private.h"
|
||||
#include "wldap32.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
|
||||
|
||||
/***********************************************************************
|
||||
* ldap_create_page_controlA (WLDAP32.@)
|
||||
*
|
||||
* See ldap_create_page_controlW.
|
||||
*/
|
||||
ULONG ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
|
||||
struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlA *control )
|
||||
{
|
||||
ULONG ret = LDAP_NOT_SUPPORTED;
|
||||
#ifdef HAVE_LDAP
|
||||
LDAPControlW *controlW = NULL;
|
||||
|
||||
TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
|
||||
critical, control );
|
||||
|
||||
if (!ld || !control) return WLDAP32_LDAP_PARAM_ERROR;
|
||||
|
||||
ret = ldap_create_page_controlW( ld, pagesize, cookie, critical, &controlW );
|
||||
if (ret == LDAP_SUCCESS)
|
||||
{
|
||||
*control = controlWtoA( controlW );
|
||||
ldap_control_freeW( controlW );
|
||||
}
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LDAP
|
||||
|
||||
/* create a page control by hand */
|
||||
static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie,
|
||||
UCHAR critical, PLDAPControlW *control )
|
||||
{
|
||||
LDAPControlW *ctrl;
|
||||
BerElement *ber;
|
||||
struct berval *berval, null_cookie = { 0, NULL };
|
||||
INT ret, len;
|
||||
char *val;
|
||||
|
||||
ber = ber_alloc_t( LBER_USE_DER );
|
||||
if (!ber) return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
if (cookie)
|
||||
ber_printf( ber, "{iO}", pagesize, cookie );
|
||||
else
|
||||
ber_printf( ber, "{iO}", pagesize, &null_cookie );
|
||||
|
||||
ret = ber_flatten( ber, &berval );
|
||||
ber_free( ber, 1 );
|
||||
|
||||
if (ret == -1)
|
||||
return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
/* copy the berval so it can be properly freed by the caller */
|
||||
val = HeapAlloc( GetProcessHeap(), 0, berval->bv_len );
|
||||
if (!val) return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
len = berval->bv_len;
|
||||
memcpy( val, berval->bv_val, len );
|
||||
ber_bvfree( berval );
|
||||
|
||||
ctrl = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) );
|
||||
if (!ctrl)
|
||||
return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
ctrl->ldctl_oid = strAtoW( LDAP_PAGED_RESULT_OID_STRING );
|
||||
ctrl->ldctl_value.bv_len = len;
|
||||
ctrl->ldctl_value.bv_val = val;
|
||||
ctrl->ldctl_iscritical = critical;
|
||||
|
||||
*control = ctrl;
|
||||
|
||||
return LDAP_SUCCESS;
|
||||
}
|
||||
|
||||
#endif /* HAVE_LDAP */
|
||||
|
||||
/***********************************************************************
|
||||
* ldap_create_page_controlW (WLDAP32.@)
|
||||
*
|
||||
* Create a control for paged search results.
|
||||
*
|
||||
* PARAMS
|
||||
* ld [I] Pointer to an LDAP context.
|
||||
* pagesize [I] Number of entries to return per page.
|
||||
* cookie [I] Used by the server to track its location in the
|
||||
* search results.
|
||||
* critical [I] Tells the server this control is critical to the
|
||||
* search operation.
|
||||
* control [O] LDAPControl created.
|
||||
*
|
||||
* RETURNS
|
||||
* Success: LDAP_SUCCESS
|
||||
* Failure: An LDAP error code.
|
||||
*/
|
||||
ULONG ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
|
||||
struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control )
|
||||
{
|
||||
ULONG ret = LDAP_NOT_SUPPORTED;
|
||||
#ifdef HAVE_LDAP
|
||||
|
||||
TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
|
||||
critical, control );
|
||||
|
||||
if (!ld || !control) return WLDAP32_LDAP_PARAM_ERROR;
|
||||
return create_page_control( pagesize, cookie, critical, control );
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
ULONG ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
|
||||
ULONG *message )
|
||||
{
|
||||
FIXME( "(%p, %p, 0x%08lx, %p)\n", ld, search, pagesize, message );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
|
||||
struct l_timeval *timeout, ULONG pagesize, ULONG *count,
|
||||
WLDAP32_LDAPMessage **results )
|
||||
{
|
||||
FIXME( "(%p, %p, %p, 0x%08lx, %p, %p)\n", ld, search, timeout,
|
||||
pagesize, count, results );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
|
||||
ULONG *count, WLDAP32_LDAPMessage *results )
|
||||
{
|
||||
ULONG ret = LDAP_NOT_SUPPORTED;
|
||||
#ifdef HAVE_LDAP
|
||||
FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results );
|
||||
|
||||
if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
|
||||
/* FIXME: save the cookie from the server here */
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
ULONG ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls,
|
||||
ULONG *count, struct WLDAP32_berval **cookie )
|
||||
{
|
||||
ULONG ret = LDAP_NOT_SUPPORTED;
|
||||
#ifdef HAVE_LDAP
|
||||
LDAPControlW **ctrlsW = NULL;
|
||||
|
||||
TRACE( "(%p, %p, %p, %p)\n", ld, ctrls, count, cookie );
|
||||
|
||||
if (!ld || !ctrls || !count || !cookie)
|
||||
return WLDAP32_LDAP_PARAM_ERROR;
|
||||
|
||||
ctrlsW = controlarrayAtoW( ctrls );
|
||||
if (!ctrlsW) return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
ret = ldap_parse_page_controlW( ld, ctrlsW, count, cookie );
|
||||
controlarrayfreeW( ctrlsW );
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
ULONG ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls,
|
||||
ULONG *count, struct WLDAP32_berval **cookie )
|
||||
{
|
||||
ULONG ret = LDAP_NOT_SUPPORTED;
|
||||
#ifdef HAVE_LDAP
|
||||
LDAPControlW *control = NULL;
|
||||
BerElement *ber;
|
||||
ber_tag_t tag;
|
||||
ULONG i;
|
||||
|
||||
TRACE( "(%p, %p, %p, %p)\n", ld, ctrls, count, cookie );
|
||||
|
||||
if (!ld || !ctrls || !count || !cookie)
|
||||
return WLDAP32_LDAP_PARAM_ERROR;
|
||||
|
||||
for (i = 0; ctrls[i]; i++)
|
||||
{
|
||||
if (!lstrcmpW( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid ))
|
||||
control = ctrls[i];
|
||||
}
|
||||
|
||||
if (!control)
|
||||
return WLDAP32_LDAP_CONTROL_NOT_FOUND;
|
||||
|
||||
ber = ber_init( &((LDAPControl *)control)->ldctl_value );
|
||||
if (!ber)
|
||||
return WLDAP32_LDAP_NO_MEMORY;
|
||||
|
||||
tag = ber_scanf( ber, "{iO}", count, cookie );
|
||||
if ( tag == LBER_ERROR )
|
||||
ret = WLDAP32_LDAP_DECODING_ERROR;
|
||||
else
|
||||
ret = LDAP_SUCCESS;
|
||||
|
||||
ber_free( ber, 1 );
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
ULONG ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search )
|
||||
{
|
||||
FIXME( "(%p, %p)\n", ld, search );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_SUCCESS;
|
||||
}
|
||||
|
||||
PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
|
||||
PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
|
||||
PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyA *sortkeys )
|
||||
{
|
||||
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_a(dn),
|
||||
scope, debugstr_a(filter), attrs, attrsonly );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PLDAPSearch ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope,
|
||||
PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
|
||||
PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys )
|
||||
{
|
||||
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_w(dn),
|
||||
scope, debugstr_w(filter), attrs, attrsonly );
|
||||
return NULL;
|
||||
}
|
|
@ -88,24 +88,6 @@ ULONG ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result
|
|||
return ret;
|
||||
}
|
||||
|
||||
ULONG ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *serverctrls,
|
||||
ULONG *count, struct WLDAP32_berval **cookie )
|
||||
{
|
||||
FIXME( "(%p, %p, %p, %p)\n", ld, serverctrls, count, cookie );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *serverctrls,
|
||||
ULONG *count, struct WLDAP32_berval **cookie )
|
||||
{
|
||||
FIXME( "(%p, %p, %p, %p)\n", ld, serverctrls, count, cookie );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
ULONG ldap_parse_referenceA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
|
||||
PCHAR **referrals )
|
||||
{
|
||||
|
|
|
@ -41,14 +41,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
|
||||
|
||||
ULONG ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search )
|
||||
{
|
||||
FIXME( "(%p, %p)\n", ld, search );
|
||||
|
||||
if (!ld) return ~0UL;
|
||||
return LDAP_SUCCESS;
|
||||
}
|
||||
|
||||
ULONG ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
|
||||
PCHAR attrs[], ULONG attrsonly )
|
||||
{
|
||||
|
@ -345,24 +337,6 @@ exit:
|
|||
return ret;
|
||||
}
|
||||
|
||||
PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
|
||||
PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
|
||||
PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyA *sortkeys )
|
||||
{
|
||||
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_a(dn),
|
||||
scope, debugstr_a(filter), attrs, attrsonly );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PLDAPSearch ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope,
|
||||
PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
|
||||
PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys )
|
||||
{
|
||||
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_w(dn),
|
||||
scope, debugstr_w(filter), attrs, attrsonly );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ULONG ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
|
||||
PCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res )
|
||||
{
|
||||
|
|
|
@ -173,6 +173,10 @@ typedef struct WLDAP32_berval
|
|||
PCHAR bv_val;
|
||||
} LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue;
|
||||
|
||||
#define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319"
|
||||
#define LDAP_PAGED_RESULT_OID_STRING_W (const WCHAR []){'1','.','2','.', \
|
||||
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}
|
||||
|
||||
typedef struct ldapcontrolA
|
||||
{
|
||||
PCHAR ldctl_oid;
|
||||
|
|
Loading…
Reference in New Issue