Changeset 652

Timestamp:

09/08/08 11:20:20 (5 months ago)

Author:

smoku

Message:

Merged GSSAPI support patch by Jelmer Vernooij

Location:

trunk

Files:

• etc/c2s.xml.dist.in (modified) (1 diff)
• sx/sasl_gsasl.c (modified) (5 diffs)

trunk/etc/c2s.xml.dist.in

@@ -346 +346 @@
         <!--
         <anonymous/>
+        <gssapi/>
         -->
       </sasl>

trunk/sx/sasl_gsasl.c

@@ -57 +57 @@
   char *service;
   char *hostname;
-  char *gssapi_display_name;
   char *realm;
 #ifndef GSASL_NO_OBSOLETE
@@ -158 +157 @@
             return;
         }
+    } else if (NULL != gsasl_property_fast(sd, GSASL_GSSAPI_DISPLAY_NAME)) {
+        creds.authzid = strdup(gsasl_property_fast(sd, GSASL_GSSAPI_DISPLAY_NAME));
+        authzid = NULL;
     } else {
         /* override unchecked arbitrary authzid */
@@ -177 +179 @@
 }
 
-/** make the stream suthenticated second time round */
+/** make the stream authenticated second time round */
 static void _sx_sasl_stream(sx_t s, sx_plugin_t p) {
     Gsasl_session *sd = (Gsasl_session *) s->plugin_data[p->index];
@@ -621 +623 @@
             return GSASL_NEEDS_MORE;
 
+        case GSASL_SERVICE:
+            gsasl_property_set(sd, GSASL_SERVICE, "xmpp");
+            return GSASL_OK;
+
+        case GSASL_HOSTNAME:
+            { 
+                char hostname[256];
+                /* get hostname */
+                hostname[0] = '\0';
+                gethostname(hostname, 256);
+                hostname[255] = '\0';
+
+                gsasl_property_set(sd, GSASL_HOSTNAME, hostname);
+           }
+           return GSASL_OK;
+
         case GSASL_VALIDATE_SIMPLE:
             /* GSASL_AUTHID, GSASL_AUTHZID, GSASL_PASSWORD */
@@ -635 +653 @@
                 return GSASL_AUTHENTICATION_ERROR;
 
+        case GSASL_VALIDATE_GSSAPI:
+            /* GSASL_AUTHZID, GSASL_GSSAPI_DISPLAY_NAME */
+            creds.authnid = gsasl_property_fast(sd, GSASL_GSSAPI_DISPLAY_NAME);
+            if(!creds.authnid) return GSASL_NO_AUTHID;
+            creds.authzid = gsasl_property_fast(sd, GSASL_AUTHZID);
+            if(!creds.authzid) return GSASL_NO_AUTHZID;
+            gsasl_property_set(sd, GSASL_AUTHID, creds.authnid);
+            return GSASL_OK;
+
         case GSASL_VALIDATE_ANONYMOUS:
             /* GSASL_ANONYMOUS_TOKEN */