From a7dfc2aadabaf7109a45302a1ba5dbe65f890bee Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 29 Jun 1999 03:29:26 +0000 Subject: [PATCH] Add sasl "mech" argument to backend bind routines. --- servers/slapd/back-bdb2/bind.c | 1 + servers/slapd/back-bdb2/external.h | 3 ++- servers/slapd/back-ldap/bind.c | 1 + servers/slapd/back-ldap/external.h | 3 ++- servers/slapd/back-ldbm/external.h | 3 ++- servers/slapd/back-perl/bind.c | 1 + servers/slapd/back-perl/external.h | 3 ++- servers/slapd/back-shell/bind.c | 1 + servers/slapd/back-shell/external.h | 3 ++- servers/slapd/back-tcl/external.h | 5 +++-- servers/slapd/back-tcl/tcl_bind.c | 3 ++- 11 files changed, 19 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-bdb2/bind.c b/servers/slapd/back-bdb2/bind.c index b51d9ea136..5524a0ea31 100644 --- a/servers/slapd/back-bdb2/bind.c +++ b/servers/slapd/back-bdb2/bind.c @@ -217,6 +217,7 @@ bdb2_back_bind( Operation *op, char *dn, int method, + char *mech, struct berval *cred, char** edn ) diff --git a/servers/slapd/back-bdb2/external.h b/servers/slapd/back-bdb2/external.h index 285f91fc44..31d2279601 100644 --- a/servers/slapd/back-bdb2/external.h +++ b/servers/slapd/back-bdb2/external.h @@ -21,7 +21,8 @@ extern int bdb2_back_db_config LDAP_P(( BackendDB *bd, extern int bdb2_back_bind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, int method, struct berval *cred, char** edn )); + char *dn, int method, char* mech, + struct berval *cred, char** edn )); extern int bdb2_back_unbind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op )); diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index 36bdf37879..26632c8246 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -38,6 +38,7 @@ ldap_back_bind( Operation *op, char *dn, int method, + char *mech, struct berval *cred, char **edn ) diff --git a/servers/slapd/back-ldap/external.h b/servers/slapd/back-ldap/external.h index 37bcc62a72..d71238c54f 100644 --- a/servers/slapd/back-ldap/external.h +++ b/servers/slapd/back-ldap/external.h @@ -16,7 +16,8 @@ extern int ldap_back_db_config LDAP_P(( BackendDB *bd, extern int ldap_back_bind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, int method, struct berval *cred, char** edn )); + char *dn, int method, char* mech, + struct berval *cred, char** edn )); extern int ldap_back_unbind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op )); diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h index 6b674eef52..dc33dda355 100644 --- a/servers/slapd/back-ldbm/external.h +++ b/servers/slapd/back-ldbm/external.h @@ -18,7 +18,8 @@ extern int ldbm_back_db_config LDAP_P(( BackendDB *bd, extern int ldbm_back_bind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, int method, char* mech, struct berval *cred, char** edn )); + char *dn, int method, char* mech, + struct berval *cred, char** edn )); extern int ldbm_back_unbind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op )); diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c index b4cd6ca45c..ad3419b56b 100644 --- a/servers/slapd/back-perl/bind.c +++ b/servers/slapd/back-perl/bind.c @@ -34,6 +34,7 @@ perl_back_bind( Operation *op, char *dn, int method, + char *mech, struct berval *cred, char** edn ) diff --git a/servers/slapd/back-perl/external.h b/servers/slapd/back-perl/external.h index e5adaae400..bd01911dc5 100644 --- a/servers/slapd/back-perl/external.h +++ b/servers/slapd/back-perl/external.h @@ -16,7 +16,8 @@ extern int perl_back_db_config LDAP_P(( BackendDB *bd, extern int perl_back_bind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, int method, struct berval *cred, char** edn )); + char *dn, int method, char* mech, + struct berval *cred, char** edn )); extern int perl_back_unbind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op )); diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c index 93ef4d869a..5e2e195ef5 100644 --- a/servers/slapd/back-shell/bind.c +++ b/servers/slapd/back-shell/bind.c @@ -17,6 +17,7 @@ shell_back_bind( Operation *op, char *dn, int method, + char *mech, struct berval *cred, char **edn ) diff --git a/servers/slapd/back-shell/external.h b/servers/slapd/back-shell/external.h index ef478c78d0..3455ff8680 100644 --- a/servers/slapd/back-shell/external.h +++ b/servers/slapd/back-shell/external.h @@ -16,7 +16,8 @@ extern int shell_back_db_config LDAP_P(( BackendDB *bd, extern int shell_back_bind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op, - char *dn, int method, struct berval *cred, char** edn )); + char *dn, int method, char* mech, + struct berval *cred, char** edn )); extern int shell_back_unbind LDAP_P(( BackendDB *bd, Connection *conn, Operation *op )); diff --git a/servers/slapd/back-tcl/external.h b/servers/slapd/back-tcl/external.h index 540808e794..c27f0e4740 100644 --- a/servers/slapd/back-tcl/external.h +++ b/servers/slapd/back-tcl/external.h @@ -1,4 +1,4 @@ -/* $Id: external.h,v 1.5 1999/02/18 01:18:39 bcollins Exp $ */ +/* $Id: external.h,v 1.6 1999/03/05 02:42:17 gomez Exp $ */ #ifndef _TCL_EXTERNAL_H #define _TCL_EXTERNAL_H @@ -20,7 +20,8 @@ extern int tcl_back_db_config LDAP_P ((BackendDB * bd, extern int tcl_back_bind LDAP_P ((BackendDB * bd, Connection * conn, Operation * op, - char *dn, int method, struct berval * cred, char **edn)); + char *dn, int method, char *mech, + struct berval * cred, char **edn)); extern int tcl_back_unbind LDAP_P ((BackendDB * bd, Connection * conn, Operation * op)); diff --git a/servers/slapd/back-tcl/tcl_bind.c b/servers/slapd/back-tcl/tcl_bind.c index 10a1d0a25f..31abd6d1da 100644 --- a/servers/slapd/back-tcl/tcl_bind.c +++ b/servers/slapd/back-tcl/tcl_bind.c @@ -1,6 +1,6 @@ /* bind.c - tcl bind routines * - * $Id: tcl_bind.c,v 1.4 1999/02/19 06:55:20 bcollins Exp $ + * $Id: tcl_bind.c,v 1.5 1999/02/28 04:55:48 bcollins Exp $ * * Copyright 1999, Ben Collins , All rights reserved. * @@ -24,6 +24,7 @@ tcl_back_bind ( Operation * op, char *dn, int method, + char *mech, struct berval *cred, char **edn ) -- 2.39.5