CVS gsasl/lib/src

[gsasl-commit]

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

Modified Files:
        callback.c gsasl.h.in property.c 
Log Message:
Cleanup properties.

--- /home/cvs/gsasl/lib/src/callback.c  2004/09/30 15:52:54     1.12
+++ /home/cvs/gsasl/lib/src/callback.c  2004/10/03 22:19:11     1.13
@@ -31,8 +31,8 @@
  * by mechanisms to discover various parameters (such as username and
  * passwords).  The callback function will be called with a
  * Gsasl_property value indicating the requested behaviour.  For
- * example, for GSASL_CLIENT_ANONYMOUS, the function is expected to
- * invoke gsasl_property_set_global(CTX, GSASL_CLIENT_ANONYMOUS,
+ * example, for GSASL_ANONYMOUS_TOKEN, the function is expected to
+ * invoke gsasl_property_set_global(CTX, GSASL_ANONYMOUS_TOKEN,
  * "token") where "token" is the anonymous token the application
  * wishes the SASL mechanism to use.  See the manual for the meaning
  * of all parameters.
@@ -52,8 +52,8 @@
  *
  * Invoke the application callback.  The @prop value indicate what the
  * callback is expected to do.  For example, for
- * GSASL_CLIENT_ANONYMOUS, the function is expected to invoke
- * gsasl_property_set(SCTX, GSASL_CLIENT_ANONYMOUS, "token") where
+ * GSASL_ANONYMOUS_TOKEN, the function is expected to invoke
+ * gsasl_property_set(SCTX, GSASL_ANONYMOUS_TOKEN, "token") where
  * "token" is the anonymous token the application wishes the SASL
  * mechanism to use.  See the manual for the meaning of all
  * parameters.
@@ -92,7 +92,7 @@
 
     switch (prop)
       {
-      case GSASL_SERVER_ANONYMOUS:
+      case GSASL_VALIDATE_ANONYMOUS:
        if (!sctx->anonymous_token)
          break;
        cb_anonymous = gsasl_server_callback_anonymous_get (sctx->ctx);
@@ -102,7 +102,7 @@
        return res;
        break;
 
-      case GSASL_SERVER_EXTERNAL:
+      case GSASL_VALIDATE_EXTERNAL:
        cb_external = gsasl_server_callback_external_get (sctx->ctx);
        if (!cb_external)
          break;
@@ -110,7 +110,7 @@
        return res;
        break;
 
-      case GSASL_SERVER_SECURID:
+      case GSASL_VALIDATE_SECURID:
        cb_securid = gsasl_server_callback_securid_get (sctx->ctx);
        if (!cb_securid)
          break;
--- /home/cvs/gsasl/lib/src/gsasl.h.in  2004/09/30 15:52:54     1.34
+++ /home/cvs/gsasl/lib/src/gsasl.h.in  2004/10/03 22:19:11     1.35
@@ -126,9 +126,7 @@
     GSASL_PASSCODE,
     GSASL_SUGGESTED_PIN,
     GSASL_PIN,
-    GSASL_CLIENT_ANONYMOUS,
-    GSASL_CLIENT_PASSCODE,
-    GSASL_CLIENT_PIN,
+    GSASL_ANONYMOUS_TOKEN,
     GSASL_CLIENT_SERVICE,
     GSASL_CLIENT_HOSTNAME,
     GSASL_CLIENT_QOP,
@@ -136,12 +134,12 @@
     GSASL_SERVER_VALIDATE,
     GSASL_SERVER_RETRIEVE,
     GSASL_SERVER_USEROK,
-    GSASL_SERVER_SECURID,
     GSASL_SERVER_CRAM_MD5,
     GSASL_SERVER_DIGEST_MD5,
     GSASL_SERVER_SERVICE,
-    GSASL_SERVER_EXTERNAL,
-    GSASL_SERVER_ANONYMOUS,
+    GSASL_VALIDATE_SECURID,
+    GSASL_VALIDATE_ANONYMOUS,
+    GSASL_VALIDATE_EXTERNAL,
     GSASL_SERVER_REALM,
     GSASL_SERVER_QOP,
     GSASL_SERVER_MAXBUF,
--- /home/cvs/gsasl/lib/src/property.c  2004/09/30 15:34:51     1.10
+++ /home/cvs/gsasl/lib/src/property.c  2004/10/03 22:19:11     1.11
@@ -31,8 +31,7 @@
 
   switch (prop)
     {
-    case GSASL_CLIENT_ANONYMOUS:
-    case GSASL_SERVER_ANONYMOUS:
+    case GSASL_ANONYMOUS_TOKEN:
       p = &sctx->anonymous_token;
       break;
 
@@ -77,8 +76,7 @@
 
   switch (prop)
     {
-    case GSASL_CLIENT_ANONYMOUS:
-    case GSASL_SERVER_ANONYMOUS:
+    case GSASL_ANONYMOUS_TOKEN:
       p = &ctx->anonymous_token;
       break;
 
@@ -287,7 +285,7 @@
 
       switch (prop)
        {
-       case GSASL_CLIENT_ANONYMOUS:
+       case GSASL_ANONYMOUS_TOKEN:
          cb_anonymous = gsasl_client_callback_anonymous_get (sctx->ctx);
          if (!cb_anonymous)
            break;