From: Juan Gomez Date: Fri, 5 Mar 1999 03:38:12 +0000 (+0000) Subject: Added parameter newSuperior in preparation to support X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~474 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ba99a75ef1639ba1c235f81ca45fd956af63a4d;p=openldap Added parameter newSuperior in preparation to support LDAP v3 MODDN request. --- diff --git a/servers/slapd/back-bdb2/external.h b/servers/slapd/back-bdb2/external.h index d3f5b535b8..285f91fc44 100644 --- a/servers/slapd/back-bdb2/external.h +++ b/servers/slapd/back-bdb2/external.h @@ -41,7 +41,8 @@ extern int bdb2_back_modify LDAP_P(( BackendDB *bd, extern int bdb2_back_modrdn LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, char*newrdn, int deleteoldrdn )); + char *dn, char*newrdn, int deleteoldrdn, + char *newSuperior )); extern int bdb2_back_add LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, Entry *e )); diff --git a/servers/slapd/back-bdb2/modrdn.c b/servers/slapd/back-bdb2/modrdn.c index 0dd5a01b6e..6e71e6b915 100644 --- a/servers/slapd/back-bdb2/modrdn.c +++ b/servers/slapd/back-bdb2/modrdn.c @@ -1,5 +1,18 @@ /* modrdn.c - bdb2 backend modrdn routine */ +/* + * LDAP v3 newSuperior support. + * + * 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 @@ -18,7 +31,8 @@ bdb2i_back_modrdn_internal( Operation *op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; @@ -189,7 +203,8 @@ bdb2_back_modrdn( Operation *op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { DB_LOCK lock; @@ -207,7 +222,8 @@ bdb2_back_modrdn( } ret = bdb2i_back_modrdn_internal( be, conn, op, dn, - newrdn, deleteoldrdn ); + newrdn, deleteoldrdn, + newSuperior ); (void) bdb2i_leave_backend_w( get_dbenv( be ), lock ); bdb2i_stop_timing( be->bd_info, time1, "MODRDN", conn, op ); diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h index 55dba8609c..54741012cf 100644 --- a/servers/slapd/back-ldbm/external.h +++ b/servers/slapd/back-ldbm/external.h @@ -38,7 +38,8 @@ extern int ldbm_back_modify LDAP_P(( BackendDB *bd, extern int ldbm_back_modrdn LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, char*newrdn, int deleteoldrdn )); + char *dn, char*newrdn, int deleteoldrdn, + char *newSuperior )); extern int ldbm_back_add LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, Entry *e )); diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c index f6ec2248fd..6e6dadacc0 100644 --- a/servers/slapd/back-ldbm/modrdn.c +++ b/servers/slapd/back-ldbm/modrdn.c @@ -1,5 +1,18 @@ /* modrdn.c - ldbm backend modrdn routine */ +/* + * LDAP v3 newSuperior support. + * + * 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 @@ -18,7 +31,8 @@ ldbm_back_modrdn( Operation *op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; diff --git a/servers/slapd/back-perl/external.h b/servers/slapd/back-perl/external.h index a6dd621b09..e5adaae400 100644 --- a/servers/slapd/back-perl/external.h +++ b/servers/slapd/back-perl/external.h @@ -36,7 +36,8 @@ extern int perl_back_modify LDAP_P(( BackendDB *bd, extern int perl_back_modrdn LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, char*newrdn, int deleteoldrdn )); + char *dn, char*newrdn, int deleteoldrdn, + char *newSuperior )); extern int perl_back_add LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, Entry *e )); diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c index 9259e21314..1542956c88 100644 --- a/servers/slapd/back-perl/modrdn.c +++ b/servers/slapd/back-perl/modrdn.c @@ -7,6 +7,19 @@ * in file LICENSE in the top-level directory of the distribution. */ +/* + * LDAP v3 newSuperior support. + * + * 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 @@ -27,7 +40,8 @@ perl_back_modrdn( Operation *op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { int len; diff --git a/servers/slapd/back-shell/external.h b/servers/slapd/back-shell/external.h index b12adc1d71..ef478c78d0 100644 --- a/servers/slapd/back-shell/external.h +++ b/servers/slapd/back-shell/external.h @@ -36,7 +36,8 @@ extern int shell_back_modify LDAP_P(( BackendDB *bd, extern int shell_back_modrdn LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, char*newrdn, int deleteoldrdn )); + char *dn, char*newrdn, int deleteoldrdn, + char *newSuperior )); extern int shell_back_add LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, Entry *e )); diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c index 36bec9e4bc..22feda1e5d 100644 --- a/servers/slapd/back-shell/modrdn.c +++ b/servers/slapd/back-shell/modrdn.c @@ -1,5 +1,18 @@ /* modrdn.c - shell backend modrdn function */ +/* + * LDAP v3 newSuperior support. + * + * 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 @@ -17,7 +30,8 @@ shell_back_modrdn( Operation *op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { struct shellinfo *si = (struct shellinfo *) be->be_private; diff --git a/servers/slapd/back-tcl/external.h b/servers/slapd/back-tcl/external.h index 62b75e8018..540808e794 100644 --- a/servers/slapd/back-tcl/external.h +++ b/servers/slapd/back-tcl/external.h @@ -1,4 +1,4 @@ -/* $Id: external.h,v 1.4 1999/02/17 00:55:03 bcollins Exp $ */ +/* $Id: external.h,v 1.5 1999/02/18 01:18:39 bcollins Exp $ */ #ifndef _TCL_EXTERNAL_H #define _TCL_EXTERNAL_H @@ -40,7 +40,8 @@ extern int tcl_back_modify LDAP_P ((BackendDB * bd, extern int tcl_back_modrdn LDAP_P ((BackendDB * bd, Connection * conn, Operation * op, - char *dn, char *newrdn, int deleteoldrdn)); + char *dn, char *newrdn, int deleteoldrdn, + char *newSuperior)); extern int tcl_back_add LDAP_P ((BackendDB * bd, Connection * conn, Operation * op, Entry * e)); diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c index 27e4360714..1dac7444c8 100644 --- a/servers/slapd/back-tcl/tcl_modrdn.c +++ b/servers/slapd/back-tcl/tcl_modrdn.c @@ -1,6 +1,6 @@ /* modrdn.c - tcl modify rdn routines * - * $Id: tcl_modrdn.c,v 1.4 1999/02/19 06:55:20 bcollins Exp $ + * $Id: tcl_modrdn.c,v 1.5 1999/02/28 04:55:49 bcollins Exp $ * * Copyright 1999, Ben Collins , All rights reserved. * @@ -10,6 +10,19 @@ * in file LICENSE in the top-level directory of the distribution. */ +/* + * LDAP v3 newSuperior support. + * + * 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 @@ -24,7 +37,8 @@ tcl_back_modrdn ( Operation * op, char *dn, char *newrdn, - int deleteoldrdn + int deleteoldrdn, + char *newSuperior ) { char *command, *suf_tcl, *results; diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 6ba2b25b3f..b1f6739dc4 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -354,7 +354,8 @@ struct backend_info { char *dn, LDAPModList *m)); int (*bi_op_modrdn) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, - char *dn, char *newrdn, int deleteoldrdn )); + char *dn, char *newrdn, int deleteoldrdn, + char *newSuperior)); int (*bi_op_add) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, Entry *e));