CVS gsasl/lib/src

[gsasl-commit]

Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv16201/lib/src

Modified Files:
        gsasl.h.in property.c 
Log Message:
Fix.

--- /home/cvs/gsasl/lib/src/gsasl.h.in  2004/09/20 23:47:52     1.19
+++ /home/cvs/gsasl/lib/src/gsasl.h.in  2004/09/21 00:23:04     1.20
@@ -57,7 +57,7 @@
       GSASL_MALLOC_ERROR = 7,
       GSASL_BASE64_ERROR = 8,
       GSASL_CRYPTO_ERROR = 9,
-      GSASL_GCRYPT_ERROR = GSASL_CRYPTO_ERROR = 10,
+      GSASL_GCRYPT_ERROR = GSASL_CRYPTO_ERROR,
       GSASL_NEED_CLIENT_ANONYMOUS_CALLBACK = 11,
       GSASL_NEED_CLIENT_PASSWORD_CALLBACK = 12,
       GSASL_NEED_CLIENT_PASSCODE_CALLBACK = 13,
@@ -104,7 +104,8 @@
       GSASL_NO_ANONYMOUS_TOKEN = 52,
       GSASL_NO_AUTHID = 53,
       GSASL_NO_AUTHZID = 54,
-      GSASL_NO_PASSWORD = 55
+      GSASL_NO_PASSWORD = 55,
+      GSASL_CANNOT_VALIDATE = 56
     } Gsasl_rc;
 
 /* Quality of Protection types, used by DIGEST-MD5 */
@@ -133,10 +134,10 @@
   /* Callback/property types. */
   typedef enum
   {
+    GSASL_AUTHID,
+    GSASL_AUTHZID,
+    GSASL_PASSWORD,
     GSASL_CLIENT_ANONYMOUS,
-    GSASL_CLIENT_AUTHID,
-    GSASL_CLIENT_AUTHZID,
-    GSASL_CLIENT_PASSWORD,
     GSASL_CLIENT_PASSCODE,
     GSASL_CLIENT_PIN,
     GSASL_CLIENT_SERVICE,
--- /home/cvs/gsasl/lib/src/property.c  2004/09/18 17:56:55     1.5
+++ /home/cvs/gsasl/lib/src/property.c  2004/09/21 00:23:04     1.6
@@ -33,15 +33,15 @@
       p = &sctx->anonymous_token;
       break;
 
-    case GSASL_CLIENT_AUTHID:
+    case GSASL_AUTHID:
       p = &sctx->authid;
       break;
 
-    case GSASL_CLIENT_AUTHZID:
+    case GSASL_AUTHZID:
       p = &sctx->authzid;
       break;
 
-    case GSASL_CLIENT_PASSWORD:
+    case GSASL_PASSWORD:
       p = &sctx->password;
       break;
 
@@ -64,15 +64,15 @@
       p = &ctx->anonymous_token;
       break;
 
-    case GSASL_CLIENT_AUTHID:
+    case GSASL_AUTHID:
       p = &ctx->authid;
       break;
 
-    case GSASL_CLIENT_AUTHZID:
+    case GSASL_AUTHZID:
       p = &ctx->authzid;
       break;
 
-    case GSASL_CLIENT_PASSWORD:
+    case GSASL_PASSWORD:
       p = &ctx->password;
       break;
 
@@ -260,7 +260,7 @@
          gsasl_property_set (sctx, prop, buf);
          break;
 
-       case GSASL_CLIENT_AUTHID:
+       case GSASL_AUTHID:
          cb_authentication_id =
            gsasl_client_callback_authentication_id_get (sctx->ctx);
          if (!cb_authentication_id)
@@ -272,7 +272,7 @@
          gsasl_property_set (sctx, prop, buf);
          break;
 
-       case GSASL_CLIENT_AUTHZID:
+       case GSASL_AUTHZID:
          cb_authorization_id =
            gsasl_client_callback_authorization_id_get (sctx->ctx);
          if (!cb_authorization_id)
@@ -284,7 +284,7 @@
          gsasl_property_set (sctx, prop, buf);
          break;
 
-       case GSASL_CLIENT_PASSWORD:
+       case GSASL_PASSWORD:
          cb_password = gsasl_client_callback_password_get (sctx->ctx);
          if (!cb_password)
            break;