mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 00:29:35 -05:00
15e6a98bba
================ Written by Hallvard B. Furuseth and placed into the public domain. This software is not subject to any license of the University of Oslo. ================ Here is a patch which does what I described. Of course, someone has to decide if that is the right solution:-) - Add an "opid:" line to the input to back-shell commands. - Add an "abandonid: <opid> line to back-shell/abandon input. - Replace message id with opid in back-tcl arguments. - Add an abandonid = <opid> argument to back-tcl/abandon. An opid (operation ID) is a "connection ID/message ID" string. I would have liked to use another name to avoid confusion with struct slap_op->o_opid, but I could not think of another apt word. This also fixes ITS#1784 and ITS#1792. Since calling conventions changed anyway, I fixed back-shell by adding abandonid: and making opid: always be the ID of the current operation. Hallvard B. Furuseth <h.b.furuseth@usit.uio.no>, May 2002.
57 lines
1.4 KiB
C
57 lines
1.4 KiB
C
/* add.c - shell backend add function */
|
|
/* $OpenLDAP$ */
|
|
/*
|
|
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/string.h>
|
|
#include <ac/socket.h>
|
|
|
|
#include "slap.h"
|
|
#include "shell.h"
|
|
|
|
int
|
|
shell_back_add(
|
|
Backend *be,
|
|
Connection *conn,
|
|
Operation *op,
|
|
Entry *e
|
|
)
|
|
{
|
|
struct shellinfo *si = (struct shellinfo *) be->be_private;
|
|
FILE *rfp, *wfp;
|
|
int len;
|
|
|
|
if ( si->si_add == NULL ) {
|
|
send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
|
|
"add not implemented", NULL, NULL );
|
|
return( -1 );
|
|
}
|
|
|
|
if ( (op->o_private = (void *) forkandexec( si->si_add, &rfp, &wfp )) == (void *) -1 ) {
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
|
|
"could not fork/exec", NULL, NULL );
|
|
return( -1 );
|
|
}
|
|
|
|
/* write out the request to the add process */
|
|
fprintf( wfp, "ADD\n" );
|
|
fprintf( wfp, "opid: %ld/%ld\n", op->o_connid, (long) op->o_msgid );
|
|
fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
|
|
print_suffixes( wfp, be );
|
|
ldap_pvt_thread_mutex_lock( &entry2str_mutex );
|
|
fprintf( wfp, "%s", entry2str( e, &len ) );
|
|
ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
|
|
fclose( wfp );
|
|
|
|
/* read in the result and send it along */
|
|
read_and_send_results( be, conn, op, rfp, NULL, 0 );
|
|
|
|
fclose( rfp );
|
|
return( 0 );
|
|
}
|