mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-27 03:20:22 +08:00
dc07e765f2
This commit includes many changes. All changes compile under NT but have not been tested under UNIX. A Summary of changes (likely incomplete): NT changes: Removed lint. Clean up configuration support for "Debug", "Release", "SDebug", and "SRelease" configurations. Share output directories for clients, libraries, and slapd. (maybe they should be combined further and moved to build/{,S}{Debug,Release}). Enable threading when _MT is defined. Enable debuging when _DEBUG is defined. Disable setting of NDEBUG under Release/SRelease. Asserts are disabled in <ac/assert.h> when LDAP_DEBUG is not defined. Added 'build/main.dsp' Master project. Removed non-slapd projects from slapd.dsp (see main.dsp). Removed replaced many uses of _WIN32 macro with feature based macros. ldap_cdefs.h changes #define LDAP_CONST const (see below) #define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST To allow specifiers to be added before and after the type declaration. (For DLL handling) LBER/LDAP changes Namespace changes: s/lber_/ber_/ for here and there. s/NAME_ERROR/LDAP_NAME_ERROR/g Deleted NULLMSG and other NULL* macros for namespace reasons. "const" libraries. Installed headers (ie: lber.h, ldap.h) use LDAP_CONST macro. Normally set to 'const' when __STDC__. Can be set externally to enable/disable 'constification' of external interface. Internal interface always uses 'const'. Did not fix warnings in -lldif (in lieu of new LDIF parser). Added _ext API implementations (excepting search and bind). Need to implement ldap_int_get_controls() for reponses with controls. Added numberous assert() checks. LDAP_R _MT defines HAVE_NT_THREADS Added numberous assert() checks. Changed ldap_pthread_t back to unsigned long. Used cast to HANDLE in _join(). LDBM Replaced _WIN32 with HAVE_SYSLOG ud Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). slapd Made connection sockbuf field a pointer to a sockbuf. This removed slap.h dependency on lber-int.h. lber-int.h now only included by those files needing to mess with the sockbuf. Used ber_* functions/macros to access sockbuf internals whenever possible. Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). Removed FD_SET unsigned lint slapd/tools Used EXEEXT to added ".exe" to routines. Need to define EXEEXT under UNIX. ldappasswd Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand(). nt_debug Minor cleanup. Added "portable.h" include and used <ac/*.h> where appropriate. Added const to char* format argument.
245 lines
5.1 KiB
C
245 lines
5.1 KiB
C
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1990 Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* modrdn.c
|
|
*/
|
|
|
|
/*
|
|
* Support for MODIFYDN REQUEST V3 (newSuperior) by:
|
|
*
|
|
* Copyright 1999, Juan C. Gomez, All rights reserved.
|
|
* This software is not subject to any license of Silicon Graphics
|
|
* Inc. or Purdue University.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* without restriction or fee of any kind as long as this notice
|
|
* is preserved.
|
|
*
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
|
|
#include "ldap-int.h"
|
|
|
|
/*
|
|
* ldap_rename - initiate an ldap extended modifyDN operation.
|
|
*
|
|
* Parameters:
|
|
* ld LDAP descriptor
|
|
* dn DN of the object to modify
|
|
* newrdn RDN to give the object
|
|
* deleteoldrdn nonzero means to delete old rdn values from the entry
|
|
* newSuperior DN of the new parent if applicable
|
|
*
|
|
* Returns the LDAP error code.
|
|
*/
|
|
|
|
int
|
|
ldap_rename(
|
|
LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *newrdn,
|
|
int deleteoldrdn,
|
|
LDAP_CONST char *newSuperior,
|
|
LDAPControl **sctrls,
|
|
LDAPControl **cctrls,
|
|
int *msgidp )
|
|
{
|
|
/*
|
|
* A modify rdn request looks like this:
|
|
* ModifyRDNRequest ::= SEQUENCE {
|
|
* entry DistinguishedName,
|
|
* newrdn RelativeDistinguishedName,
|
|
* deleteoldrdn BOOLEAN
|
|
* newSuperior [0] DistinguishedName [v3 only]
|
|
* }
|
|
*/
|
|
|
|
BerElement *ber;
|
|
int rc;
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
|
|
|
|
/* create a message to send */
|
|
if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
|
|
return( LDAP_NO_MEMORY );
|
|
}
|
|
|
|
if( newSuperior != NULL ) {
|
|
/* must be version 3 (or greater) */
|
|
if ( ld->ld_version == 0 ) {
|
|
ld->ld_version = LDAP_VERSION3;
|
|
}
|
|
|
|
if ( ld->ld_version < LDAP_VERSION3 ) {
|
|
ld->ld_errno = LDAP_NOT_SUPPORTED;
|
|
ber_free( ber, 1 );
|
|
return( ld->ld_errno );
|
|
}
|
|
|
|
rc = ber_printf( ber, "{it{ssbts}", /* leave '}' for later */
|
|
++ld->ld_msgid, LDAP_REQ_MODDN,
|
|
dn, newrdn, deleteoldrdn,
|
|
LDAP_TAG_NEWSUPERIOR, newSuperior );
|
|
|
|
} else {
|
|
rc = ber_printf( ber, "{it{ssb}", /* leave '}' for later */
|
|
++ld->ld_msgid, LDAP_REQ_MODDN,
|
|
dn, newrdn, deleteoldrdn );
|
|
}
|
|
|
|
if ( rc < 0 ) {
|
|
ld->ld_errno = LDAP_ENCODING_ERROR;
|
|
ber_free( ber, 1 );
|
|
return( ld->ld_errno );
|
|
}
|
|
|
|
/* Put Server Controls */
|
|
if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
|
|
ber_free( ber, 1 );
|
|
return ld->ld_errno;
|
|
}
|
|
|
|
/* close the '{' */
|
|
rc = ber_printf( ber, "}" );
|
|
if ( rc < 0 ) {
|
|
ld->ld_errno = LDAP_ENCODING_ERROR;
|
|
ber_free( ber, 1 );
|
|
return( ld->ld_errno );
|
|
}
|
|
|
|
/* send the message */
|
|
*msgidp = ldap_send_initial_request( ld, LDAP_REQ_MODRDN, dn, ber );
|
|
|
|
if( *msgidp < 0 ) {
|
|
return( ld->ld_errno );
|
|
}
|
|
|
|
return LDAP_SUCCESS;
|
|
}
|
|
|
|
|
|
/*
|
|
* ldap_rename2 - initiate an ldap (and X.500) modifyDN operation. Parameters:
|
|
* (LDAP V3 MODIFYDN REQUEST)
|
|
* ld LDAP descriptor
|
|
* dn DN of the object to modify
|
|
* newrdn RDN to give the object
|
|
* deleteoldrdn nonzero means to delete old rdn values from the entry
|
|
* newSuperior DN of the new parent if applicable
|
|
*
|
|
* ldap_rename2 uses a U-Mich Style API. It returns the msgid.
|
|
*/
|
|
|
|
int
|
|
ldap_rename2(
|
|
LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *newrdn,
|
|
int deleteoldrdn,
|
|
LDAP_CONST char *newSuperior )
|
|
{
|
|
int msgid;
|
|
int rc;
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
|
|
|
|
rc = ldap_rename( ld, dn, newrdn, deleteoldrdn, newSuperior,
|
|
NULL, NULL, &msgid );
|
|
|
|
return rc == LDAP_SUCCESS ? msgid : -1;
|
|
}
|
|
|
|
|
|
/*
|
|
* ldap_modrdn2 - initiate an ldap modifyRDN operation. Parameters:
|
|
*
|
|
* ld LDAP descriptor
|
|
* dn DN of the object to modify
|
|
* newrdn RDN to give the object
|
|
* deleteoldrdn nonzero means to delete old rdn values from the entry
|
|
*
|
|
* Example:
|
|
* msgid = ldap_modrdn( ld, dn, newrdn );
|
|
*/
|
|
int
|
|
ldap_modrdn2( LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *newrdn,
|
|
int deleteoldrdn )
|
|
{
|
|
return ldap_rename2( ld, dn, newrdn, deleteoldrdn, NULL );
|
|
}
|
|
|
|
int
|
|
ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
|
|
{
|
|
return( ldap_rename2( ld, dn, newrdn, 1, NULL ) );
|
|
}
|
|
|
|
|
|
int
|
|
ldap_rename_s(
|
|
LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *newrdn,
|
|
int deleteoldrdn,
|
|
LDAP_CONST char *newSuperior,
|
|
LDAPControl **sctrls,
|
|
LDAPControl **cctrls )
|
|
{
|
|
int rc;
|
|
int msgid;
|
|
LDAPMessage *res;
|
|
|
|
rc = ldap_rename( ld, dn, newrdn, deleteoldrdn,
|
|
newSuperior, sctrls, cctrls, &msgid );
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
return rc;
|
|
}
|
|
|
|
rc = ldap_result( ld, msgid, 1, NULL, &res );
|
|
|
|
if( rc == -1 ) {
|
|
return ld->ld_errno;
|
|
}
|
|
|
|
return ldap_result2error( ld, res, 1 );
|
|
}
|
|
|
|
int
|
|
ldap_rename2_s(
|
|
LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *newrdn,
|
|
int deleteoldrdn,
|
|
LDAP_CONST char *newSuperior )
|
|
{
|
|
return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, newSuperior, NULL, NULL );
|
|
}
|
|
|
|
int
|
|
ldap_modrdn2_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )
|
|
{
|
|
return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, NULL, NULL, NULL );
|
|
}
|
|
|
|
int
|
|
ldap_modrdn_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
|
|
{
|
|
return ldap_rename_s( ld, dn, newrdn, 1, NULL, NULL, NULL );
|
|
}
|
|
|