mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08: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.
62 lines
1.5 KiB
C
62 lines
1.5 KiB
C
/* $OpenLDAP$ */
|
|
/* abandon.c - tcl abandon routine
|
|
*
|
|
* Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted only
|
|
* as authorized by the OpenLDAP Public License. A copy of this
|
|
* license is available at http://www.OpenLDAP.org/license.html or
|
|
* in file LICENSE in the top-level directory of the distribution.
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "slap.h"
|
|
#include "tcl_back.h"
|
|
|
|
int
|
|
tcl_back_abandon (
|
|
Backend * be,
|
|
Connection * conn,
|
|
Operation * op,
|
|
int msgid
|
|
)
|
|
{
|
|
char *results, *command;
|
|
struct berval suf_tcl;
|
|
int code, err = 0;
|
|
struct tclinfo *ti = (struct tclinfo *) be->be_private;
|
|
|
|
if (ti->ti_abandon.bv_len == 0) {
|
|
return (-1);
|
|
}
|
|
|
|
if (tcl_merge_bvlist(be->be_suffix, &suf_tcl) == NULL) {
|
|
return (-1);
|
|
}
|
|
|
|
command = (char *) ch_malloc (ti->ti_abandon.bv_len + suf_tcl.bv_len
|
|
+ 80);
|
|
sprintf (command, "%s ABANDON {%ld/%ld} {%s} {%ld/%d}",
|
|
ti->ti_abandon.bv_val, op->o_connid, (long) op->o_msgid,
|
|
suf_tcl.bv_val, op->o_connid, msgid);
|
|
Tcl_Free (suf_tcl.bv_val);
|
|
|
|
ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
|
|
code = Tcl_GlobalEval (ti->ti_ii->interp, command);
|
|
results = (char *) ch_strdup (ti->ti_ii->interp->result);
|
|
ldap_pvt_thread_mutex_unlock (&tcl_interpreter_mutex);
|
|
free (command);
|
|
|
|
if (code != TCL_OK) {
|
|
err = LDAP_OPERATIONS_ERROR;
|
|
Debug (LDAP_DEBUG_SHELL, "tcl_abandon_error: %s\n", results,
|
|
0, 0);
|
|
}
|
|
|
|
free (results);
|
|
return (err);
|
|
}
|