wldap32: Move support for rename functions to the Unix library.

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2021-04-19 10:04:48 +02:00 committed by Alexandre Julliard
parent 274e399121
commit 91355dae93
1 changed files with 50 additions and 152 deletions

View File

@ -18,71 +18,40 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#ifdef HAVE_LDAP_H
#include <ldap.h>
#endif
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winldap_private.h"
#include "wldap32.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "winldap_private.h"
#ifdef HAVE_LDAP
WINE_DEFAULT_DEBUG_CHANNEL(wldap32); WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
#endif
/*********************************************************************** /***********************************************************************
* ldap_rename_extA (WLDAP32.@) * ldap_rename_extA (WLDAP32.@)
* *
* See ldap_rename_extW. * See ldap_rename_extW.
*/ */
ULONG CDECL ldap_rename_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn, ULONG CDECL ldap_rename_extA( WLDAP32_LDAP *ld, char *dn, char *newrdn, char *newparent, int delete,
PCHAR newparent, INT delete, PLDAPControlA *serverctrls, LDAPControlA **serverctrls, LDAPControlA **clientctrls, ULONG *message )
PLDAPControlA *clientctrls, ULONG *message )
{ {
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; ULONG ret = WLDAP32_LDAP_NO_MEMORY;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL; WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
ret = WLDAP32_LDAP_NO_MEMORY; TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p, %p)\n", ld, debugstr_a(dn), debugstr_a(newrdn), debugstr_a(newparent),
delete, serverctrls, clientctrls, message );
TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p, %p)\n", ld, debugstr_a(dn),
debugstr_a(newrdn), debugstr_a(newparent), delete,
serverctrls, clientctrls, message );
if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR;
if (dn) { if (dn && !(dnW = strAtoW( dn ))) goto exit;
dnW = strAtoW( dn ); if (newrdn && !(newrdnW = strAtoW( newrdn ))) goto exit;
if (!dnW) goto exit; if (newparent && !(newparentW = strAtoW( newparent ))) goto exit;
} if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit;
if (newrdn) { if (clientctrls && !(clientctrlsW = controlarrayAtoW( clientctrls ))) goto exit;
newrdnW = strAtoW( newrdn );
if (!newrdnW) goto exit;
}
if (newparent) {
newparentW = strAtoW( newparent );
if (!newparentW) goto exit;
}
if (serverctrls) {
serverctrlsW = controlarrayAtoW( serverctrls );
if (!serverctrlsW) goto exit;
}
if (clientctrls) {
clientctrlsW = controlarrayAtoW( clientctrls );
if (!clientctrlsW) goto exit;
}
ret = ldap_rename_extW( ld, dnW, newrdnW, newparentW, delete, ret = ldap_rename_extW( ld, dnW, newrdnW, newparentW, delete, serverctrlsW, clientctrlsW, message );
serverctrlsW, clientctrlsW, message );
exit: exit:
strfreeW( dnW ); strfreeW( dnW );
@ -90,8 +59,6 @@ exit:
strfreeW( newparentW ); strfreeW( newparentW );
controlarrayfreeW( serverctrlsW ); controlarrayfreeW( serverctrlsW );
controlarrayfreeW( clientctrlsW ); controlarrayfreeW( clientctrlsW );
#endif
return ret; return ret;
} }
@ -119,55 +86,32 @@ exit:
* the operation. Cancel the operation by calling ldap_abandon * the operation. Cancel the operation by calling ldap_abandon
* with the message ID. * with the message ID.
*/ */
ULONG CDECL ldap_rename_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, ULONG CDECL ldap_rename_extW( WLDAP32_LDAP *ld, WCHAR *dn, WCHAR *newrdn, WCHAR *newparent, int delete,
PWCHAR newparent, INT delete, PLDAPControlW *serverctrls, LDAPControlW **serverctrls, LDAPControlW **clientctrls, ULONG *message )
PLDAPControlW *clientctrls, ULONG *message )
{ {
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; ULONG ret = WLDAP32_LDAP_NO_MEMORY;
#ifdef HAVE_LDAP
char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL; char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; LDAPControlU **serverctrlsU = NULL, **clientctrlsU = NULL;
ret = WLDAP32_LDAP_NO_MEMORY; TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p, %p)\n", ld, debugstr_w(dn), debugstr_w(newrdn), debugstr_w(newparent),
delete, serverctrls, clientctrls, message );
TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p, %p)\n", ld, debugstr_w(dn),
debugstr_w(newrdn), debugstr_w(newparent), delete,
serverctrls, clientctrls, message );
if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR; if (!ld || !message) return WLDAP32_LDAP_PARAM_ERROR;
if (dn) { if (dn && !(dnU = strWtoU( dn ))) goto exit;
dnU = strWtoU( dn ); if (newrdn && !(newrdnU = strWtoU( newrdn ))) goto exit;
if (!dnU) goto exit; if (newparent && !(newparentU = strWtoU( newparent ))) goto exit;
} if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit;
if (newrdn) { if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit;
newrdnU = strWtoU( newrdn );
if (!newrdnU) goto exit;
}
if (newparent) {
newparentU = strWtoU( newparent );
if (!newparentU) goto exit;
}
if (serverctrls) {
serverctrlsU = controlarrayWtoU( serverctrls );
if (!serverctrlsU) goto exit;
}
if (clientctrls) {
clientctrlsU = controlarrayWtoU( clientctrls );
if (!clientctrlsU) goto exit;
}
ret = map_error( ldap_rename( ld->ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU,
delete, serverctrlsU, clientctrlsU, (int *)message ));
ret = map_error( ldap_funcs->ldap_rename( ld->ld, dnU, newrdnU, newparentU, delete, serverctrlsU, clientctrlsU,
message ) );
exit: exit:
strfreeU( dnU ); strfreeU( dnU );
strfreeU( newrdnU ); strfreeU( newrdnU );
strfreeU( newparentU ); strfreeU( newparentU );
controlarrayfreeU( serverctrlsU ); controlarrayfreeU( serverctrlsU );
controlarrayfreeU( clientctrlsU ); controlarrayfreeU( clientctrlsU );
#endif
return ret; return ret;
} }
@ -176,46 +120,25 @@ exit:
* *
* See ldap_rename_ext_sW. * See ldap_rename_ext_sW.
*/ */
ULONG CDECL ldap_rename_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn, ULONG CDECL ldap_rename_ext_sA( WLDAP32_LDAP *ld, char *dn, char *newrdn, char *newparent, int delete,
PCHAR newparent, INT delete, PLDAPControlA *serverctrls, LDAPControlA **serverctrls, LDAPControlA **clientctrls )
PLDAPControlA *clientctrls )
{ {
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; ULONG ret = WLDAP32_LDAP_NO_MEMORY;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL; WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
ret = WLDAP32_LDAP_NO_MEMORY; TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p)\n", ld, debugstr_a(dn), debugstr_a(newrdn), debugstr_a(newparent),
delete, serverctrls, clientctrls );
TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p)\n", ld, debugstr_a(dn),
debugstr_a(newrdn), debugstr_a(newparent), delete,
serverctrls, clientctrls );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
if (dn) { if (dn && !(dnW = strAtoW( dn ))) goto exit;
dnW = strAtoW( dn ); if (newrdn && !(newrdnW = strAtoW( newrdn ))) goto exit;
if (!dnW) goto exit; if (newparent && !(newparentW = strAtoW( newparent ))) goto exit;
} if (serverctrls && !(serverctrlsW = controlarrayAtoW( serverctrls ))) goto exit;
if (newrdn) { if (clientctrls && !(clientctrlsW = controlarrayAtoW( clientctrls ))) goto exit;
newrdnW = strAtoW( newrdn );
if (!newrdnW) goto exit;
}
if (newparent) {
newparentW = strAtoW( newparent );
if (!newparentW) goto exit;
}
if (serverctrls) {
serverctrlsW = controlarrayAtoW( serverctrls );
if (!serverctrlsW) goto exit;
}
if (clientctrls) {
clientctrlsW = controlarrayAtoW( clientctrls );
if (!clientctrlsW) goto exit;
}
ret = ldap_rename_ext_sW( ld, dnW, newrdnW, newparentW, delete, ret = ldap_rename_ext_sW( ld, dnW, newrdnW, newparentW, delete, serverctrlsW, clientctrlsW );
serverctrlsW, clientctrlsW );
exit: exit:
strfreeW( dnW ); strfreeW( dnW );
@ -223,8 +146,6 @@ exit:
strfreeW( newparentW ); strfreeW( newparentW );
controlarrayfreeW( serverctrlsW ); controlarrayfreeW( serverctrlsW );
controlarrayfreeW( clientctrlsW ); controlarrayfreeW( clientctrlsW );
#endif
return ret; return ret;
} }
/*********************************************************************** /***********************************************************************
@ -245,54 +166,31 @@ exit:
* Success: LDAP_SUCCESS * Success: LDAP_SUCCESS
* Failure: An LDAP error code. * Failure: An LDAP error code.
*/ */
ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, WCHAR *dn, WCHAR *newrdn, WCHAR *newparent, int delete,
PWCHAR newparent, INT delete, PLDAPControlW *serverctrls, LDAPControlW **serverctrls, LDAPControlW **clientctrls )
PLDAPControlW *clientctrls )
{ {
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; ULONG ret = WLDAP32_LDAP_PARAM_ERROR;
#ifdef HAVE_LDAP
char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL; char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; LDAPControlU **serverctrlsU = NULL, **clientctrlsU = NULL;
ret = WLDAP32_LDAP_NO_MEMORY; TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p)\n", ld, debugstr_w(dn), debugstr_w(newrdn), debugstr_w(newparent),
delete, serverctrls, clientctrls );
TRACE( "(%p, %s, %s, %s, 0x%02x, %p, %p)\n", ld, debugstr_w(dn),
debugstr_w(newrdn), debugstr_w(newparent), delete,
serverctrls, clientctrls );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
if (dn) { if (dn && !(dnU = strWtoU( dn ))) goto exit;
dnU = strWtoU( dn ); if (newrdn && !(newrdnU = strWtoU( newrdn ))) goto exit;
if (!dnU) goto exit; if (newparent && !(newparentU = strWtoU( newparent ))) goto exit;
} if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit;
if (newrdn) { if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit;
newrdnU = strWtoU( newrdn );
if (!newrdnU) goto exit;
}
if (newparent) {
newparentU = strWtoU( newparent );
if (!newparentU) goto exit;
}
if (serverctrls) {
serverctrlsU = controlarrayWtoU( serverctrls );
if (!serverctrlsU) goto exit;
}
if (clientctrls) {
clientctrlsU = controlarrayWtoU( clientctrls );
if (!clientctrlsU) goto exit;
}
ret = map_error( ldap_rename_s( ld->ld, dn ? dnU : "", newrdn ? newrdnU : "", newparentU,
delete, serverctrlsU, clientctrlsU ));
ret = map_error( ldap_funcs->ldap_rename_s( ld->ld, dnU, newrdnU, newparentU, delete, serverctrlsU,
clientctrlsU ) );
exit: exit:
strfreeU( dnU ); strfreeU( dnU );
strfreeU( newrdnU ); strfreeU( newrdnU );
strfreeU( newparentU ); strfreeU( newparentU );
controlarrayfreeU( serverctrlsU ); controlarrayfreeU( serverctrlsU );
controlarrayfreeU( clientctrlsU ); controlarrayfreeU( clientctrlsU );
#endif
return ret; return ret;
} }