Add sasl "mech" argument to backend bind routines.

diff --git a/servers/slapd/back-bdb2/bind.c b/servers/slapd/back-bdb2/bind.c
index b51d9ea1360ce31e1559a7a43db5954da42732ad..5524a0ea31a80c09a1aa51555695312e7d43168a 100644 (file)
--- 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 285f91fc4454c61945b307cc162bc43a8c9ade1b..31d22796017043ee61b4e4e6f4b8ac397ccede38 100644 (file)
--- 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 36bdf37879518e98b0872498ed3bd2af4fb2ac12..26632c82466b25fc4d9a6635d04502878bb0079d 100644 (file)
--- 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 37bcc62a72bea21d49ac7985db0a7597728645ff..d71238c54f8b939dbdc3dd6802cdfb9071db3fb8 100644 (file)
--- 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 6b674eef5238b8b28d94c42f4b47a2fa180340d7..dc33dda355029788e073d9cd3ccc905f3988ff40 100644 (file)
--- 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 b4cd6ca45c7f7c4c9419ac861e595149b429912b..ad3419b56bb4984d7fbae7cedb89eb545d73798a 100644 (file)
--- 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 e5adaae4006342a86726c73976178b1e4d0a4433..bd01911dc572e0c0acf3fb7eacc44b0eecc65c5d 100644 (file)
--- 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 93ef4d869a177b225d16d01a2c55f7636bb99157..5e2e195ef546447404b6490ea239b371fa4c33d9 100644 (file)
--- 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 ef478c78d00583c53da5e636ef3f30eadc62d132..3455ff8680818d9783a0e3de6855e55f52fd1f0f 100644 (file)
--- 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 540808e7944271959e6c1ac6eb7dc4e15924e616..c27f0e4740fb69bdc9ffa4a62d83a07e5478577c 100644 (file)
--- 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 10a1d0a25f44e43e8df3af47fb62849e5a01b352..31abd6d1da8b3cc6e071db6cc6f50dac28ecb391 100644 (file)
--- 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 <bcollins@debian.org>, All rights reserved.
  *
@@ -24,6 +24,7 @@ tcl_back_bind (
        Operation * op,
        char *dn,
        int method,
+       char            *mech,
        struct berval *cred,
        char **edn
 )