From 6164387805efc64a201204fa81e531a201d77014 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Thu, 24 Jul 2003 09:44:52 +0000
Subject: [PATCH] Fix the OID of "admin" extended service. Swap the
 human-readable text corresponding to the CQL and
 OCLC-userInfo 	OIDs, which had somehow got confused. Bring
 the CHANGELOG up to date with these and other changes.

---
 CHANGELOG  |   17 +++++++++++++++++
 util/oid.c |    9 ++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1695a7f..6481b85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- (IN PROGRESS)
+
 SortResponse member resultCount now set to NULL in sort handler of
 frontend server.
 
@@ -19,6 +21,21 @@ is back to YAZ 2.0.2.
 
 String value attributes for CCL parser.
 
+Support for OCLC's locally registered "OCLC-UserInformation" PDU,
+which their FirstSearch server returns in Init responses, sometimes
+carrying useful diagnostic information when Init fails.  This has the
+OID 1.2.840.10003.10.1000.17.1 and is defined in the file
+"z39.50/oclcui.asn", where its definition is somewhat different from
+what OCLC document on their web-site, as required to interoperate with
+their servers.
+
+Support for anonymous authentication in yaz-client.  Use the command
+"auth -".
+
+* Fix the OID of the Index Data-local "admin" Extended Service from 
+  1.2.840.10003.9.81.1 to 1.2.840.10003.9.1000.81.1.  The omission of
+  the 1000, which indicates a locally-defined OID, was a mistake.
+
 --- 2.0.3 2003/06/20
 
 Fix CCL directive @case handling so that it affects string match for
diff --git a/util/oid.c b/util/oid.c
index 44ce5bb..22a8373 100644
--- a/util/oid.c
+++ b/util/oid.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: oid.c,v 1.65 2003-07-23 12:07:30 mike Exp $
+ * $Id: oid.c,v 1.66 2003-07-24 09:44:52 mike Exp $
  */
 
 /*
@@ -234,8 +234,7 @@ static oident standard_oids[] =
      "exp. spec."},
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_EXPORTINV,    {9,7,-1},
      "exp. inv."},
-    /* ### Next line should be {9,1000,81,1,-1} */
-    {PROTO_Z3950,   CLASS_EXTSERV, VAL_ADMINSERVICE, {9,81,1,-1},
+    {PROTO_Z3950,   CLASS_EXTSERV, VAL_ADMINSERVICE, {9,1000,81,1,-1},
      "Admin"},
     {PROTO_Z3950,   CLASS_USERINFO,VAL_SEARCHRES1,   {10,1,-1},
      "searchResult-1"},
@@ -300,7 +299,7 @@ static oident standard_oids[] =
     {PROTO_Z3950,   CLASS_NEGOT,   VAL_CHARNEG3,     {15,3,-1},
      "CharSetandLanguageNegotiation-3"},
     {PROTO_Z3950,   CLASS_USERINFO,VAL_CQL,          {16, 2, -1},
-     "OCLC-userInfo"},
+     "CQL"},
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS2,    {1,0,10646,1,0,2,-1},
      "UCS-2"},
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS4,    {1,0,10646,1,0,4,-1},
@@ -310,7 +309,7 @@ static oident standard_oids[] =
     {PROTO_GENERAL, CLASS_GENERAL, VAL_UTF8,    {1,0,10646,1,0,8,-1},
      "UTF-8"},
     {PROTO_Z3950,   CLASS_USERINFO,VAL_OCLCUI,  {10, 1000, 17, 1, -1},
-     "CQL"},
+     "OCLC-userInfo"},
     {PROTO_NOP,     CLASS_NOP,     VAL_NOP,       {-1},        0          }
 };
 
-- 
1.7.10.4