remove plugin backreferences, we can do it ourselves

diff --git a/include/saslplug.h b/include/saslplug.h
index b2cae16..fc4c48e 100755 (executable)
--- a/include/saslplug.h
+++ b/include/saslplug.h
@@ -257,7 +257,7 @@ typedef struct sasl_client_params {
     void *gss_creds;
     void *chanbindingstype;
     void *chanbindingsdata;
-    struct sasl_client_plug *plug;
+    void *spare_ptr4;
 
     /* Canonicalize a user name from on-wire to internal format
      *  added rjs3 2001-05-23
@@ -557,7 +557,7 @@ typedef struct sasl_server_params {
     void *gss_creds;
     void *chanbindingstype;
     void *chanbindingsdata;
-    struct sasl_server_plug *plug;
+    void *spare_ptr4;
     int (*spare_fptr1)();
     int (*spare_fptr2)();
     int chanbindingslen;

diff --git a/lib/client.c b/lib/client.c
index 91c2e2d..9fdcf46 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -652,7 +652,6 @@ int sasl_client_step(sasl_conn_t *conn,
   if(clientoutlen) *clientoutlen = 0;
 
   /* do a step */
-  c_conn->cparams->plug = c_conn->mech->m.plug;
   result = c_conn->mech->m.plug->mech_step(conn->context,
                                         c_conn->cparams,
                                         serverin,
@@ -661,7 +660,6 @@ int sasl_client_step(sasl_conn_t *conn,
                                         clientout, clientoutlen,
                                         &conn->oparams);
 
-  c_conn->cparams->plug = NULL;
   if (result == SASL_OK) {
       /* So we're done on this end, but if both
        * 1. the mech does server-send-last

diff --git a/lib/server.c b/lib/server.c
index 59c61ff..8d1a8c2 100644 (file)
--- a/lib/server.c
+++ b/lib/server.c
@@ -1427,7 +1427,6 @@ int sasl_server_step(sasl_conn_t *conn,
     if(serverout) *serverout = NULL;
     if(serveroutlen) *serveroutlen = 0;
 
-    s_conn->sparams->plug = s_conn->mech->m.plug;
     ret = s_conn->mech->m.plug->mech_step(conn->context,
                                        s_conn->sparams,
                                        clientin,
@@ -1436,7 +1435,6 @@ int sasl_server_step(sasl_conn_t *conn,
                                        serveroutlen,
                                        &conn->oparams);
 
-    s_conn->sparams->plug = NULL;
     if (ret == SASL_OK) {
        ret = do_authorization(s_conn);
     }