X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=8b1b3d1fa3cac7d050bb1e73eec1d6e8247372cb;hb=79aa866d87464ecd3fc451668017c0fa1adb2776;hp=b7709e41f5cbe232845ab14bfa02031c30770d05;hpb=4102d95bf434baaf92b1a8db63d1f7396c8e469f;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index b7709e4..8b1b3d1 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.52 2005-11-16 16:07:52 mike Exp $
+ * $Id: zoom-c.c,v 1.54 2005-12-08 15:36:31 adam Exp $
  */
 /**
  * \file zoom-c.c
@@ -388,6 +388,26 @@ 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 *remainder, *pass;
+
+        *(char*)val = '\0';
+        remainder = xstrdup(val+1);
+        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 +1083,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.52 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.54 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,