From 4fb9818b0657f561397b29e55d87cc8d4f194436 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 16 Jan 2004 10:04:54 +0000
Subject: [PATCH] Make ZOOM C recognize option password

---
 CHANGELOG     |    3 +++
 doc/zoom.xml  |    4 ++--
 src/zoom-c.c  |   10 +++++++---
 zoom/zoomsh.c |    9 ++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1621a7b..ffa8528 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+Make ZOOM C recognize option "password". If unset, "pass" is used
+(for backwards compatibility).
+
 Fixed a bug in Generic Frontend Server that could make it crash if a
 client sets characterSetNegotation bit, but didn't pass negotiation stuff
 in InitRequest.
diff --git a/doc/zoom.xml b/doc/zoom.xml
index 7eae006..f4ccd1c 100644
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -1,4 +1,4 @@
-<!-- $Id: zoom.xml,v 1.36 2003-11-25 09:55:20 mike Exp $ -->
+<!-- $Id: zoom.xml,v 1.37 2004-01-16 10:04:54 adam Exp $ -->
  <chapter id="zoom"><title>ZOOM</title>
   <para>
     &zoom; is an acronym for 'Z39.50 Object-Orientation Model' and is
@@ -130,7 +130,7 @@
         group</entry><entry>Authentication group name
        </entry><entry>none</entry></row>
       <row><entry>
-        pass</entry><entry>Authentication password
+        password</entry><entry>Authentication password.
        </entry><entry>none</entry></row>
       <row><entry>
         host</entry><entry>Target host. This setting is "read-only".
diff --git a/src/zoom-c.c b/src/zoom-c.c
index 674f314..cb3dbdb 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.18 2004-01-12 12:10:17 adam Exp $
+ * $Id: zoom-c.c,v 1.19 2004-01-16 10:04:54 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -895,9 +895,13 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
         odr_malloc(c->odr_out, sizeof(*auth));
     const char *auth_groupId = ZOOM_options_get (c->options, "group");
     const char *auth_userId = ZOOM_options_get (c->options, "user");
-    const char *auth_password = ZOOM_options_get (c->options, "pass");
+    const char *auth_password = ZOOM_options_get (c->options, "password");
     char *version;
 
+    /* support the pass for backwards compatibility */
+    if (!auth_password)
+	auth_password = ZOOM_options_get (c->options, "pass");
+	
     ODR_MASK_SET(ireq->options, Z_Options_search);
     ODR_MASK_SET(ireq->options, Z_Options_present);
     ODR_MASK_SET(ireq->options, Z_Options_scan);
@@ -918,7 +922,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.18 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.19 $");
     if (strlen(version) > 10)	/* check for unexpanded CVS strings */
 	version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 342e546..0196c81 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,9 +1,12 @@
 /*
- * $Id: zoomsh.c,v 1.25 2004-01-12 12:10:44 adam Exp $
+ * Copyright (c) 2002-2004, Index Data.
+ * See the file LICENSE for details.
  *
- * ZOOM-C Shell
+ * $Id: zoomsh.c,v 1.26 2004-01-16 10:04:55 adam Exp $
  */
 
+/* ZOOM-C Shell */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -391,7 +394,7 @@ static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
     printf (" piggyback\n");
     printf (" group\n");
     printf (" user\n");
-    printf (" pass\n");
+    printf (" password\n");
     printf (" implementationName\n");
     printf (" charset\n");
     printf (" lang\n");
-- 
1.7.10.4