X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzoom-c.c;h=1c67d1d70fb52df9f81a19a3566710c00c48d1a3;hb=72009188eda06296bb8839ef16de1470ecc2d240;hp=7795fb57607aa687faf3f457d7f01c9b88bdb161;hpb=54833ceee2850b3de2f7ee28c6f9ca9e021b7fc8;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 7795fb5..1c67d1d 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.51 2005-11-08 16:52:29 mike Exp $
+ * $Id: zoom-c.c,v 1.53 2005-12-07 16:15:15 mike Exp $
  */
 /**
  * \file zoom-c.c
@@ -388,6 +388,24 @@ ZOOM_connection_connect(ZOOM_connection c,
     else
         c->host_port = xstrdup(host);
 
+    if ((val = strchr(c->host_port, '%')) != 0) {
+        /* We recognise <username>:<password>%<string> for embedded
+         * authentication.  This is slightly hacky syntax, but it's
+         * hard to get into the comstack code in a
+         * protocol-independent way.
+         */
+        *(char*)val = '\0';
+        char *remainder = xstrdup(val+1);
+        char *pass = strchr(c->host_port, ':');
+        if (pass != 0) {
+            *pass++ = '\0';
+            ZOOM_connection_option_set(c, "user", c->host_port);
+            ZOOM_connection_option_set(c, "password", pass);
+        }
+        xfree(c->host_port);
+        c->host_port = remainder;
+    }
+
     ZOOM_options_set(c->options, "host", c->host_port);
 
     val = ZOOM_options_get (c->options, "cookie");
@@ -1063,7 +1081,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
         ZOOM_options_get(c->options, "implementationName"),
         odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
 
-    version = odr_strdup(c->odr_out, "$Revision: 1.51 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.53 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
@@ -3592,6 +3610,14 @@ ZOOM_connection_addinfo (ZOOM_connection c)
 }
 
 ZOOM_API(const char *)
+ZOOM_connection_diagset (ZOOM_connection c)
+{
+    const char *diagset;
+    ZOOM_connection_error_x (c, 0, 0, &diagset);
+    return diagset;
+}
+
+ZOOM_API(const char *)
 ZOOM_diag_str (int error)
 {
     switch (error)