Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
56a94afc
Commit
56a94afc
authored
19 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Correct prototype for ldap_search_ext_s.
Improve error handling for the search functions.
parent
b296b042
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/wldap32/search.c
+214
-136
214 additions, 136 deletions
dlls/wldap32/search.c
dlls/wldap32/winldap_private.h
+2
-2
2 additions, 2 deletions
dlls/wldap32/winldap_private.h
include/winldap.h
+2
-2
2 additions, 2 deletions
include/winldap.h
with
218 additions
and
140 deletions
dlls/wldap32/search.c
+
214
−
136
View file @
56a94afc
...
...
@@ -46,22 +46,30 @@ ULONG ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
WCHAR
*
baseW
,
*
filterW
,
**
attrsW
;
WCHAR
*
baseW
=
NULL
,
*
filterW
=
NULL
,
**
attrsW
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx)
\n
"
,
ld
,
debugstr_a
(
base
),
scope
,
debugstr_a
(
filter
),
attrs
,
attrsonly
);
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
return
LDAP_NO_MEMORY
;
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
)
return
~
0UL
;
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
return
LDAP_NO_MEMORY
;
if
(
base
)
{
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
goto
exit
;
}
if
(
filter
)
{
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
goto
exit
;
}
if
(
attrs
)
{
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
goto
exit
;
}
ret
=
ldap_searchW
(
ld
,
baseW
,
scope
,
filterW
,
attrsW
,
attrsonly
);
exit:
strfreeW
(
baseW
);
strfreeW
(
filterW
);
strarrayfreeW
(
attrsW
);
...
...
@@ -75,22 +83,30 @@ ULONG ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
char
*
baseU
,
*
filterU
,
**
attrsU
;
char
*
baseU
=
NULL
,
*
filterU
=
NULL
,
**
attrsU
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx)
\n
"
,
ld
,
debugstr_w
(
base
),
scope
,
debugstr_w
(
filter
),
attrs
,
attrsonly
);
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
return
LDAP_NO_MEMORY
;
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
)
return
~
0UL
;
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
return
LDAP_NO_MEMORY
;
if
(
base
)
{
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
goto
exit
;
}
if
(
filter
)
{
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
goto
exit
;
}
if
(
attrs
)
{
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
goto
exit
;
}
ret
=
ldap_search
(
ld
,
baseU
,
scope
,
filterU
,
attrsU
,
attrsonly
);
exit:
strfreeU
(
baseU
);
strfreeU
(
filterU
);
strarrayfreeU
(
attrsU
);
...
...
@@ -105,33 +121,42 @@ ULONG ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
WCHAR
*
baseW
,
*
filterW
,
**
attrsW
;
LDAPControlW
**
serverctrlsW
,
**
clientctrlsW
;
WCHAR
*
baseW
=
NULL
,
*
filterW
=
NULL
,
**
attrsW
=
NULL
;
LDAPControlW
**
serverctrlsW
=
NULL
,
**
clientctrlsW
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_a
(
base
),
scope
,
debugstr_a
(
filter
),
attrs
,
attrsonly
,
serverctrls
,
clientctrls
,
timelimit
,
sizelimit
,
message
);
if
(
!
ld
)
return
~
0UL
;
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
return
LDAP_NO_MEMORY
;
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
return
LDAP_NO_MEMORY
;
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
return
LDAP_NO_MEMORY
;
serverctrlsW
=
controlarrayAtoW
(
serverctrls
);
if
(
!
serverctrlsW
)
return
LDAP_NO_MEMORY
;
clientctrlsW
=
controlarrayAtoW
(
clientctrls
);
if
(
!
clientctrlsW
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
goto
exit
;
}
if
(
filter
)
{
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
goto
exit
;
}
if
(
attrs
)
{
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
goto
exit
;
}
if
(
serverctrls
)
{
serverctrlsW
=
controlarrayAtoW
(
serverctrls
);
if
(
!
serverctrlsW
)
goto
exit
;
}
if
(
clientctrls
)
{
clientctrlsW
=
controlarrayAtoW
(
clientctrls
);
if
(
!
clientctrlsW
)
goto
exit
;
}
ret
=
ldap_search_extW
(
ld
,
baseW
,
scope
,
filterW
,
attrsW
,
attrsonly
,
serverctrlsW
,
clientctrlsW
,
timelimit
,
sizelimit
,
message
);
exit:
strfreeW
(
baseW
);
strfreeW
(
filterW
);
strarrayfreeW
(
attrsW
);
...
...
@@ -148,30 +173,38 @@ ULONG ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
char
*
baseU
,
*
filterU
,
**
attrsU
;
LDAPControl
**
serverctrlsU
,
**
clientctrlsU
;
char
*
baseU
=
NULL
,
*
filterU
=
NULL
,
**
attrsU
=
NULL
;
LDAPControl
**
serverctrlsU
=
NULL
,
**
clientctrlsU
=
NULL
;
struct
timeval
tv
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_w
(
base
),
scope
,
debugstr_w
(
filter
),
attrs
,
attrsonly
,
serverctrls
,
clientctrls
,
timelimit
,
sizelimit
,
message
);
if
(
!
ld
)
return
~
0UL
;
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
return
LDAP_NO_MEMORY
;
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
return
LDAP_NO_MEMORY
;
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
return
LDAP_NO_MEMORY
;
serverctrlsU
=
controlarrayWtoU
(
serverctrls
);
if
(
!
serverctrlsU
)
return
LDAP_NO_MEMORY
;
clientctrlsU
=
controlarrayWtoU
(
clientctrls
);
if
(
!
clientctrlsU
)
return
LDAP_NO_MEMORY
;
if
(
base
)
{
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
goto
exit
;
}
if
(
filter
)
{
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
goto
exit
;
}
if
(
attrs
)
{
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
goto
exit
;
}
if
(
serverctrls
)
{
serverctrlsU
=
controlarrayWtoU
(
serverctrls
);
if
(
!
serverctrlsU
)
goto
exit
;
}
if
(
clientctrls
)
{
clientctrlsU
=
controlarrayWtoU
(
clientctrls
);
if
(
!
clientctrlsU
)
goto
exit
;
}
tv
.
tv_sec
=
timelimit
;
tv
.
tv_usec
=
0
;
...
...
@@ -179,6 +212,7 @@ ULONG ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
ret
=
ldap_search_ext
(
ld
,
baseU
,
scope
,
filterU
,
attrsU
,
attrsonly
,
serverctrlsU
,
clientctrlsU
,
&
tv
,
sizelimit
,
(
int
*
)
message
);
exit:
strfreeU
(
baseU
);
strfreeU
(
filterU
);
strarrayfreeU
(
attrsU
);
...
...
@@ -191,37 +225,45 @@ ULONG ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
ULONG
ldap_search_ext_sA
(
WLDAP32_LDAP
*
ld
,
PCHAR
base
,
ULONG
scope
,
PCHAR
filter
,
PCHAR
attrs
[],
ULONG
attrsonly
,
PLDAPControlA
*
serverctrls
,
PLDAPControlA
*
clientctrls
,
ULONG
timelimi
t
,
ULONG
sizelimit
,
WLDAP32_LDAPMessage
**
res
)
PLDAPControlA
*
clientctrls
,
struct
l_timeval
*
timeou
t
,
ULONG
sizelimit
,
WLDAP32_LDAPMessage
**
res
)
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
WCHAR
*
baseW
,
*
filterW
,
**
attrsW
;
LDAPControlW
**
serverctrlsW
,
**
clientctrlsW
;
WCHAR
*
baseW
=
NULL
,
*
filterW
=
NULL
,
**
attrsW
=
NULL
;
LDAPControlW
**
serverctrlsW
=
NULL
,
**
clientctrlsW
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p,
0x%08lx
, 0x%08lx, %p)
\n
"
,
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p,
%p
, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_a
(
base
),
scope
,
debugstr_a
(
filter
),
attrs
,
attrsonly
,
serverctrls
,
clientctrls
,
timelimit
,
sizelimit
,
res
);
if
(
!
ld
)
return
~
0UL
;
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
return
LDAP_NO_MEMORY
;
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
return
LDAP_NO_MEMORY
;
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
return
LDAP_NO_MEMORY
;
serverctrlsW
=
controlarrayAtoW
(
serverctrls
);
if
(
!
serverctrlsW
)
return
LDAP_NO_MEMORY
;
clientctrlsW
=
controlarrayAtoW
(
clientctrls
);
if
(
!
clientctrlsW
)
return
LDAP_NO_MEMORY
;
serverctrls
,
clientctrls
,
timeout
,
sizelimit
,
res
);
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
goto
exit
;
}
if
(
filter
)
{
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
goto
exit
;
}
if
(
attrs
)
{
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
goto
exit
;
}
if
(
serverctrls
)
{
serverctrlsW
=
controlarrayAtoW
(
serverctrls
);
if
(
!
serverctrlsW
)
goto
exit
;
}
if
(
clientctrls
)
{
clientctrlsW
=
controlarrayAtoW
(
clientctrls
);
if
(
!
clientctrlsW
)
goto
exit
;
}
ret
=
ldap_search_ext_sW
(
ld
,
baseW
,
scope
,
filterW
,
attrsW
,
attrsonly
,
serverctrlsW
,
clientctrlsW
,
time
limi
t
,
sizelimit
,
res
);
serverctrlsW
,
clientctrlsW
,
time
ou
t
,
sizelimit
,
res
);
exit:
strfreeW
(
baseW
);
strfreeW
(
filterW
);
strarrayfreeW
(
attrsW
);
...
...
@@ -234,41 +276,45 @@ ULONG ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
ULONG
ldap_search_ext_sW
(
WLDAP32_LDAP
*
ld
,
PWCHAR
base
,
ULONG
scope
,
PWCHAR
filter
,
PWCHAR
attrs
[],
ULONG
attrsonly
,
PLDAPControlW
*
serverctrls
,
PLDAPControlW
*
clientctrls
,
ULONG
timelimi
t
,
ULONG
sizelimit
,
WLDAP32_LDAPMessage
**
res
)
PLDAPControlW
*
clientctrls
,
struct
l_timeval
*
timeou
t
,
ULONG
sizelimit
,
WLDAP32_LDAPMessage
**
res
)
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
char
*
baseU
,
*
filterU
,
**
attrsU
;
LDAPControl
**
serverctrlsU
,
**
clientctrlsU
;
struct
timeval
tv
;
char
*
baseU
=
NULL
,
*
filterU
=
NULL
,
**
attrsU
=
NULL
;
LDAPControl
**
serverctrlsU
=
NULL
,
**
clientctrlsU
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p,
0x%08lx
, 0x%08lx, %p)
\n
"
,
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p,
%p
, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_w
(
base
),
scope
,
debugstr_w
(
filter
),
attrs
,
attrsonly
,
serverctrls
,
clientctrls
,
timelimit
,
sizelimit
,
res
);
if
(
!
ld
)
return
~
0UL
;
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
return
LDAP_NO_MEMORY
;
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
return
LDAP_NO_MEMORY
;
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
return
LDAP_NO_MEMORY
;
serverctrlsU
=
controlarrayWtoU
(
serverctrls
);
if
(
!
serverctrlsU
)
return
LDAP_NO_MEMORY
;
clientctrlsU
=
controlarrayWtoU
(
clientctrls
);
if
(
!
clientctrlsU
)
return
LDAP_NO_MEMORY
;
tv
.
tv_sec
=
timelimit
;
tv
.
tv_usec
=
0
;
serverctrls
,
clientctrls
,
timeout
,
sizelimit
,
res
);
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
goto
exit
;
}
if
(
filter
)
{
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
goto
exit
;
}
if
(
attrs
)
{
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
goto
exit
;
}
if
(
serverctrls
)
{
serverctrlsU
=
controlarrayWtoU
(
serverctrls
);
if
(
!
serverctrlsU
)
goto
exit
;
}
if
(
clientctrls
)
{
clientctrlsU
=
controlarrayWtoU
(
clientctrls
);
if
(
!
clientctrlsU
)
goto
exit
;
}
ret
=
ldap_search_ext_s
(
ld
,
baseU
,
scope
,
filterU
,
attrsU
,
attrsonly
,
serverctrlsU
,
clientctrlsU
,
&
tv
,
sizelimit
,
res
);
serverctrlsU
,
clientctrlsU
,
(
struct
timeval
*
)
timeout
,
sizelimit
,
res
);
exit:
strfreeU
(
baseU
);
strfreeU
(
filterU
);
strarrayfreeU
(
attrsU
);
...
...
@@ -284,22 +330,30 @@ ULONG ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
WCHAR
*
baseW
,
*
filterW
,
**
attrsW
;
WCHAR
*
baseW
=
NULL
,
*
filterW
=
NULL
,
**
attrsW
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_a
(
base
),
scope
,
debugstr_a
(
filter
),
attrs
,
attrsonly
,
res
);
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
return
LDAP_NO_MEMORY
;
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
return
LDAP_NO_MEMORY
;
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
goto
exit
;
}
if
(
filter
)
{
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
goto
exit
;
}
if
(
attrs
)
{
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
goto
exit
;
}
ret
=
ldap_search_sW
(
ld
,
baseW
,
scope
,
filterW
,
attrsW
,
attrsonly
,
res
);
exit:
strfreeW
(
baseW
);
strfreeW
(
filterW
);
strarrayfreeW
(
attrsW
);
...
...
@@ -313,22 +367,30 @@ ULONG ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
char
*
baseU
,
*
filterU
,
**
attrsU
;
char
*
baseU
=
NULL
,
*
filterU
=
NULL
,
**
attrsU
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p)
\n
"
,
ld
,
debugstr_w
(
base
),
scope
,
debugstr_w
(
filter
),
attrs
,
attrsonly
,
res
);
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
return
LDAP_NO_MEMORY
;
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
return
LDAP_NO_MEMORY
;
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
goto
exit
;
}
if
(
filter
)
{
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
goto
exit
;
}
if
(
attrs
)
{
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
goto
exit
;
}
ret
=
ldap_search_s
(
ld
,
baseU
,
scope
,
filterU
,
attrsU
,
attrsonly
,
res
);
exit:
strfreeU
(
baseU
);
strfreeU
(
filterU
);
strarrayfreeU
(
attrsU
);
...
...
@@ -343,24 +405,32 @@ ULONG ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
WCHAR
*
baseW
,
*
filterW
,
**
attrsW
;
WCHAR
*
baseW
=
NULL
,
*
filterW
=
NULL
,
**
attrsW
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p)
\n
"
,
ld
,
debugstr_a
(
base
),
scope
,
debugstr_a
(
filter
),
attrs
,
attrsonly
,
timeout
,
res
);
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
return
LDAP_NO_MEMORY
;
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
return
LDAP_NO_MEMORY
;
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseW
=
strAtoW
(
base
);
if
(
!
baseW
)
goto
exit
;
}
if
(
filter
)
{
filterW
=
strAtoW
(
filter
);
if
(
!
filterW
)
goto
exit
;
}
if
(
attrs
)
{
attrsW
=
strarrayAtoW
(
attrs
);
if
(
!
attrsW
)
goto
exit
;
}
ret
=
ldap_search_stW
(
ld
,
baseW
,
scope
,
filterW
,
attrsW
,
attrsonly
,
timeout
,
res
);
exit:
strfreeW
(
baseW
);
strfreeW
(
filterW
);
strarrayfreeW
(
attrsW
);
...
...
@@ -375,24 +445,32 @@ ULONG ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope,
{
ULONG
ret
=
LDAP_NOT_SUPPORTED
;
#ifdef HAVE_LDAP
char
*
baseU
,
*
filterU
,
**
attrsU
;
char
*
baseU
=
NULL
,
*
filterU
=
NULL
,
**
attrsU
=
NULL
;
ret
=
LDAP_NO_MEMORY
;
TRACE
(
"(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p)
\n
"
,
ld
,
debugstr_w
(
base
),
scope
,
debugstr_w
(
filter
),
attrs
,
attrsonly
,
timeout
,
res
);
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
return
LDAP_NO_MEMORY
;
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
return
LDAP_NO_MEMORY
;
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
return
LDAP_NO_MEMORY
;
if
(
!
ld
||
!
res
)
return
WLDAP32_LDAP_PARAM_ERROR
;
if
(
base
)
{
baseU
=
strWtoU
(
base
);
if
(
!
baseU
)
goto
exit
;
}
if
(
filter
)
{
filterU
=
strWtoU
(
filter
);
if
(
!
filterU
)
goto
exit
;
}
if
(
attrs
)
{
attrsU
=
strarrayWtoU
(
attrs
);
if
(
!
attrsU
)
goto
exit
;
}
ret
=
ldap_search_st
(
ld
,
baseU
,
scope
,
filterU
,
attrsU
,
attrsonly
,
(
struct
timeval
*
)
timeout
,
res
);
exit:
strfreeU
(
baseU
);
strfreeU
(
filterU
);
strarrayfreeU
(
attrsU
);
...
...
This diff is collapsed.
Click to expand it.
dlls/wldap32/winldap_private.h
+
2
−
2
View file @
56a94afc
...
...
@@ -135,9 +135,9 @@ ULONG ldap_search_extA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPContro
ULONG
ldap_search_extW
(
WLDAP32_LDAP
*
,
PWCHAR
,
ULONG
,
PWCHAR
,
PWCHAR
[],
ULONG
,
PLDAPControlW
*
,
PLDAPControlW
*
,
ULONG
,
ULONG
,
ULONG
*
);
ULONG
ldap_search_ext_sA
(
WLDAP32_LDAP
*
,
PCHAR
,
ULONG
,
PCHAR
,
PCHAR
[],
ULONG
,
PLDAPControlA
*
,
PLDAPControlA
*
,
ULONG
,
ULONG
,
WLDAP32_LDAPMessage
**
);
PLDAPControlA
*
,
struct
l_timeval
*
,
ULONG
,
WLDAP32_LDAPMessage
**
);
ULONG
ldap_search_ext_sW
(
WLDAP32_LDAP
*
,
PWCHAR
,
ULONG
,
PWCHAR
,
PWCHAR
[],
ULONG
,
PLDAPControlW
*
,
PLDAPControlW
*
,
ULONG
,
ULONG
,
WLDAP32_LDAPMessage
**
);
PLDAPControlW
*
,
struct
l_timeval
*
,
ULONG
,
WLDAP32_LDAPMessage
**
);
ULONG
ldap_search_sA
(
WLDAP32_LDAP
*
,
PCHAR
,
ULONG
,
PCHAR
,
PCHAR
[],
ULONG
,
WLDAP32_LDAPMessage
**
);
ULONG
ldap_search_sW
(
WLDAP32_LDAP
*
,
PWCHAR
,
ULONG
,
PWCHAR
,
PWCHAR
[],
ULONG
,
WLDAP32_LDAPMessage
**
);
ULONG
ldap_search_stA
(
WLDAP32_LDAP
*
,
const
PCHAR
,
ULONG
,
const
PCHAR
,
PCHAR
[],
ULONG
,
...
...
This diff is collapsed.
Click to expand it.
include/winldap.h
+
2
−
2
View file @
56a94afc
...
...
@@ -447,9 +447,9 @@ ULONG ldap_search_extW(LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
PLDAPControlW
*
,
ULONG
,
ULONG
,
ULONG
*
);
#define ldap_search_ext WINELIB_NAME_AW(ldap_search_ext)
ULONG
ldap_search_ext_sA
(
LDAP
*
,
PCHAR
,
ULONG
,
PCHAR
,
PCHAR
[],
ULONG
,
PLDAPControlA
*
,
PLDAPControlA
*
,
ULONG
,
ULONG
,
LDAPMessage
**
);
PLDAPControlA
*
,
struct
l_timeval
*
,
ULONG
,
LDAPMessage
**
);
ULONG
ldap_search_ext_sW
(
LDAP
*
,
PWCHAR
,
ULONG
,
PWCHAR
,
PWCHAR
[],
ULONG
,
PLDAPControlW
*
,
PLDAPControlW
*
,
ULONG
,
ULONG
,
LDAPMessage
**
);
PLDAPControlW
*
,
struct
l_timeval
*
,
ULONG
,
LDAPMessage
**
);
#define ldap_search_ext_s WINELIB_NAME_AW(ldap_search_ext_s)
PLDAPSearch
ldap_search_init_pageA
(
PLDAP
,
PCHAR
,
ULONG
,
PCHAR
,
PCHAR
[],
ULONG
,
PLDAPControlA
*
,
PLDAPControlA
*
,
ULONG
,
ULONG
,
PLDAPSortKeyA
*
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment