complete moving logic to server

[cyrus-sasl.git] / lib / common.c

diff --git a/lib/common.c b/lib/common.c
index 6a1ae35..620395a 100644 (file)
--- a/lib/common.c
+++ b/lib/common.c
@@ -970,6 +970,18 @@ int sasl_getprop(sasl_conn_t *conn, int propnum, const void **pvalue)
       else
          *((const char **)pvalue) = conn->oparams.client_creds;
       break;
+  case SASL_GSS_PEER_NAME:
+      if(! conn->oparams.gss_peer_name)
+         result = SASL_NOTDONE;
+      else
+         *((const char **)pvalue) = conn->oparams.gss_peer_name;
+      break;
+  case SASL_GSS_LOCAL_NAME:
+      if(! conn->oparams.gss_peer_name)
+         result = SASL_NOTDONE;
+      else
+         *((const char **)pvalue) = conn->oparams.gss_local_name;
+      break;
   case SASL_SSF_EXTERNAL:
       *((const sasl_ssf_t **)pvalue) = &conn->external.ssf;
       break;
@@ -1190,6 +1202,27 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
       }
       break;
 
+  case SASL_GSS_CREDS:
+    if (conn->type == SASL_CONN_SERVER)
+        ((sasl_server_conn_t *)conn)->sparams->gss_creds = (void *)value;
+    else
+        ((sasl_client_conn_t *)conn)->cparams->gss_creds = (void *)value;
+    break;
+  case SASL_CHANNEL_BINDING: {
+    struct sasl_channel_binding *cb = (struct sasl_channel_binding *)value;
+
+    if (conn->type == SASL_CONN_SERVER) {
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingtype = cb->type;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingdata = cb->data;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindinglen = cb->len;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingcrit = cb->critical;
+    } else {
+        ((sasl_client_conn_t *)conn)->cparams->chanbindingtype = cb->type;
+        ((sasl_client_conn_t *)conn)->cparams->chanbindingdata = cb->data;
+        ((sasl_client_conn_t *)conn)->cparams->chanbindinglen = cb->len;
+    }
+    break;
+  }
   default:
       sasl_seterror(conn, 0, "Unknown parameter type");
       result = SASL_BADPARAM;
@@ -2298,6 +2331,24 @@ int sasl_listmech(sasl_conn_t *conn,
     PARAMERROR(conn);
 }
 
+int _sasl_is_equal_mech(const char *req_mech,
+                        const char *plug_mech,
+                        int *plus)
+{
+    size_t len = strlen(req_mech);
+    size_t n;
+
+    if (len > 5 &&
+        strcasecmp(&req_mech[len - 5], "-PLUS") == 0) {
+        n = len - 5;
+        *plus = 1;
+    } else {
+        n = len;
+        *plus = 0;
+    }
+
+    return (strncasecmp(req_mech, plug_mech, n) == 0);
+}
 
 #ifndef WIN32
 static char *