GSS_S_PROMPTING_NEEDED is a bit

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

diff --git a/lib/server.c b/lib/server.c
index 928447d..c0ee30f 100644 (file)
--- a/lib/server.c
+++ b/lib/server.c
@@ -1025,6 +1025,7 @@ static int mech_permitted(sasl_conn_t *conn,
     if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context)
             == SASL_OK) {
        const char *mlist = NULL;
+       int plus = 0;
 
        getopt(context, NULL, "mech_list", &mlist, NULL);
 
@@ -1034,9 +1035,8 @@ static int mech_permitted(sasl_conn_t *conn,
 
            while (*mlist) {
                for (cp = mlist; *cp && !isspace((int) *cp); cp++);
-               if (((size_t) (cp - mlist) == strlen(plug->mech_name)) &&
-                   !strncasecmp(mlist, plug->mech_name,
-                                strlen(plug->mech_name))) {
+               if (_sasl_is_equal_mech(mlist, plug->mech_name, (size_t) (cp - mlist), &plus)) {
+                   /* found a match */
                    break;
                }
                mlist = cp;
@@ -1214,6 +1214,7 @@ int sasl_server_start(sasl_conn_t *conn,
     int result;
     context_list_t *cur, **prev;
     mechanism_t *m;
+    size_t mech_len;
     int plus = 0;
 
     if (_sasl_server_active==0) return SASL_NOTINIT;
@@ -1221,6 +1222,7 @@ int sasl_server_start(sasl_conn_t *conn,
     /* make sure mech is valid mechanism
        if not return appropriate error */
     m=mechlist->mech_list;
+    mech_len = strlen(mech);
 
     /* check parameters */
     if(!conn) return SASL_BADPARAM;
@@ -1232,7 +1234,7 @@ int sasl_server_start(sasl_conn_t *conn,
     if(serveroutlen) *serveroutlen = 0;
 
     while (m != NULL) {
-       if (_sasl_is_equal_mech(mech, m->m.plug->mech_name, &plus))
+       if (_sasl_is_equal_mech(mech, m->m.plug->mech_name, mech_len, &plus))
            break;
 
        m = m->next;
@@ -1459,7 +1461,7 @@ int sasl_server_step(sasl_conn_t *conn,
            if (SASL_CB_CRITICAL(s_conn->sparams)) {
                sasl_seterror(conn, 0,
                              "server requires channel binding but client provided none");
-               ret = SASL_BADAUTH;
+               ret = SASL_BADBINDING;
            }
            break;
        case SASL_CB_DISP_WANT:
@@ -1473,13 +1475,13 @@ int sasl_server_step(sasl_conn_t *conn,
            if (!SASL_CB_PRESENT(s_conn->sparams)) {
                sasl_seterror(conn, 0,
                              "client provided channel binding but server had none");
-               ret = SASL_BADAUTH;
+               ret = SASL_BADBINDING;
            } else if (strcmp(conn->oparams.cbindingname,
                       s_conn->sparams->cbinding->name) != 0) {
                sasl_seterror(conn, 0,
                              "client channel binding %s does not match server %s",
                              conn->oparams.cbindingname, s_conn->sparams->cbinding->name);
-               ret = SASL_BADAUTH;
+               ret = SASL_BADBINDING;
            }
            break;
        }