cleanup

[cyrus-sasl.git] / include / saslplug.h

diff --git a/include/saslplug.h b/include/saslplug.h
index fecb7de..19eaefe 100755 (executable)
--- a/include/saslplug.h
+++ b/include/saslplug.h
@@ -255,8 +255,8 @@ typedef struct sasl_client_params {
 
     /* for additions which don't require a version upgrade; set to 0 */
     void *gss_creds;
-    void *spare_ptr2;
-    void *spare_ptr3;
+    void *chanbindingstype;
+    void *chanbindingsdata;
     void *spare_ptr4;
 
     /* Canonicalize a user name from on-wire to internal format
@@ -289,7 +289,7 @@ typedef struct sasl_client_params {
 
     int (*spare_fptr1)();
 
-    int spare_int1;
+    int chanbindingslen;
     int spare_int2;
     int spare_int3;
 
@@ -329,6 +329,8 @@ typedef struct sasl_client_params {
 /* This plugin allows proxying */
 #define SASL_FEAT_ALLOWS_PROXY 0x0020
 
+/* Underlying mechanism uses GSS framing */
+#define SASL_FEAT_GSS_FRAMING       0x0040
 /* client plug-in features */
 #define SASL_FEAT_NEEDSERVERFQDN 0x0001
 
@@ -551,12 +553,12 @@ typedef struct sasl_server_params {
 
     /* for additions which don't require a version upgrade; set to 0 */
     void *gss_creds;
-    void *spare_ptr2;
-    void *spare_ptr3;
+    void *chanbindingstype;
+    void *chanbindingsdata;
     void *spare_ptr4;
     int (*spare_fptr1)();
     int (*spare_fptr2)();
-    int spare_int1;
+    int chanbindingslen;
     int spare_int2;
     int spare_int3;