This should bring us in sync with the version distributed as 1.0b

[yaz-moved-to-github.git] / asn / proto.c

diff --git a/asn/proto.c b/asn/proto.c
index 5c87b25..b745479 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.32  1995-06-19 12:37:28  quinn
+ * Revision 1.34  1995-06-19 17:01:48  quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.33  1995/06/19  13:39:56  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.32  1995/06/19  12:37:28  quinn
  * Fixed a bug in the compspec.
  *
  * Revision 1.31  1995/06/16  13:15:56  quinn
@@ -458,7 +464,7 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
 
     if (o->direction == ODR_DECODE)
        *p = odr_malloc(o, sizeof(**p));
-    else
+    else if (!*p)
        return opt && odr_ok(o);
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
@@ -748,7 +754,7 @@ int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
        {-1, -1, -1, Z_DiagForm_v2AddInfo, odr_visiblestring},
        {-1, -1, -1, Z_DiagForm_v3AddInfo, z_InternationalString},
        {ODR_IMPLICIT, ODR_CONTEXT, ODR_VISIBLESTRING, Z_DiagForm_v2AddInfo,
-           odr_visiblestring}, /* to match some weird server.. */
+           odr_visiblestring}, /* To cater to a bug in the CNIDR servers */
        {-1, -1, -1, -1, 0}
     };
     if (!odr_sequence_begin(o, p, sizeof(**p)))