gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS gsasl/lib/src


From: gsasl-commit
Subject: CVS gsasl/lib/src
Date: Thu, 14 Oct 2004 21:06:40 +0200

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

Modified Files:
        gsasl.h.in internal.h property.c 
Log Message:
Support service and hostname properties.


--- /home/cvs/gsasl/lib/src/gsasl.h.in  2004/10/04 01:53:26     1.37
+++ /home/cvs/gsasl/lib/src/gsasl.h.in  2004/10/14 19:06:40     1.38
@@ -127,8 +127,8 @@
     GSASL_SUGGESTED_PIN,
     GSASL_PIN,
     GSASL_ANONYMOUS_TOKEN,
-    GSASL_CLIENT_SERVICE,
-    GSASL_CLIENT_HOSTNAME,
+    GSASL_SERVICE,
+    GSASL_HOSTNAME,
     GSASL_CLIENT_QOP,
     GSASL_CLIENT_MAXBUF,
     GSASL_SERVER_VALIDATE,
@@ -136,7 +136,6 @@
     GSASL_SERVER_USEROK,
     GSASL_SERVER_CRAM_MD5,
     GSASL_SERVER_DIGEST_MD5,
-    GSASL_SERVER_SERVICE,
     GSASL_VALIDATE_SECURID,
     GSASL_VALIDATE_ANONYMOUS,
     GSASL_VALIDATE_EXTERNAL,
--- /home/cvs/gsasl/lib/src/internal.h  2004/09/30 15:52:54     1.18
+++ /home/cvs/gsasl/lib/src/internal.h  2004/10/14 19:06:40     1.19
@@ -53,6 +53,8 @@
   char *passcode;
   char *pin;
   char *suggestedpin;
+  char *service;
+  char *hostname;
   /* Obsolete stuff. */
   Gsasl_client_callback_authorization_id cbc_authorization_id;
   Gsasl_client_callback_authentication_id cbc_authentication_id;
@@ -95,6 +97,8 @@
   char *passcode;
   char *pin;
   char *suggestedpin;
+  char *service;
+  char *hostname;
   /* Obsolete stuff. */
   void *application_data;
 };
--- /home/cvs/gsasl/lib/src/property.c  2004/10/03 22:19:11     1.11
+++ /home/cvs/gsasl/lib/src/property.c  2004/10/14 19:06:40     1.12
@@ -35,6 +35,14 @@
       p = &sctx->anonymous_token;
       break;
 
+    case GSASL_SERVICE:
+      p = &sctx->service;
+      break;
+
+    case GSASL_HOSTNAME:
+      p = &sctx->hostname;
+      break;
+
     case GSASL_AUTHID:
       p = &sctx->authid;
       break;
@@ -80,6 +88,14 @@
       p = &ctx->anonymous_token;
       break;
 
+    case GSASL_SERVICE:
+      p = &ctx->service;
+      break;
+
+    case GSASL_HOSTNAME:
+      p = &ctx->hostname;
+      break;
+
     case GSASL_AUTHID:
       p = &ctx->authid;
       break;
@@ -276,6 +292,7 @@
       Gsasl_client_callback_password cb_password;
       Gsasl_client_callback_passcode cb_passcode;
       Gsasl_client_callback_pin cb_pin;
+      Gsasl_client_callback_service cb_service;
       char buf[BUFSIZ];
       size_t buflen = BUFSIZ - 1;
       int res;
@@ -285,6 +302,28 @@
 
       switch (prop)
        {
+       case GSASL_SERVICE:
+         cb_service = gsasl_client_callback_service_get (sctx->ctx);
+         if (!cb_service)
+           break;
+         res = cb_service (sctx, buf, &buflen, NULL, 0, NULL, 0);
+         if (res != GSASL_OK)
+           break;
+         buf[buflen] = '\0';
+         gsasl_property_set (sctx, prop, buf);
+         break;
+
+       case GSASL_HOSTNAME:
+         cb_service = gsasl_client_callback_service_get (sctx->ctx);
+         if (!cb_service)
+           break;
+         res = cb_service (sctx, NULL, 0, buf, &buflen, NULL, 0);
+         if (res != GSASL_OK)
+           break;
+         buf[buflen] = '\0';
+         gsasl_property_set (sctx, prop, buf);
+         break;
+
        case GSASL_ANONYMOUS_TOKEN:
          cb_anonymous = gsasl_client_callback_anonymous_get (sctx->ctx);
          if (!cb_anonymous)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]