* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.3 1995-02-09 15:51:39 quinn
+ * Revision 1.8 1995-03-14 16:59:24 quinn
+ * Fixed OPTIONAL flag in attributeelement
+ *
+ * Revision 1.7 1995/03/07 16:29:33 quinn
+ * Added authentication stuff.
+ *
+ * Revision 1.6 1995/03/01 14:46:03 quinn
+ * Fixed protocol bug in 8777query.
+ *
+ * Revision 1.5 1995/02/14 11:54:22 quinn
+ * Fixing include.
+ *
+ * Revision 1.4 1995/02/10 15:54:30 quinn
+ * Small adjustments.
+ *
+ * Revision 1.3 1995/02/09 15:51:39 quinn
* Works better now.
*
* Revision 1.2 1995/02/06 21:26:07 quinn
5, 0) &&
odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
6, 0) &&
- odr_implicit(o, odr_visiblestring, &pp->idAuthentication, ODR_CONTEXT,
+ odr_explicit(o, odr_any, &pp->idAuthentication, ODR_CONTEXT,
7, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
110, 1) &&
odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
6, 0) &&
odr_implicit(o, odr_bool, &pp->result, ODR_CONTEXT, 12, 0) &&
- odr_implicit(o, odr_visiblestring, &pp->idAuthentication, ODR_CONTEXT,
- 7, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
110, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationName, ODR_CONTEXT,
odr_sequence_end(o);
}
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ odr_visiblestring(o, &(*p)->user, 0) &&
+ odr_visiblestring(o, &(*p)->password, 0) &&
+ odr_visiblestring(o, &(*p)->account, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_StrAuthentication(ODR o, char **p, int opt)
+{
+ return odr_visiblestring(o, p, opt);
+}
+
/* ------------------------ SEARCH SERVICE ----------------------- */
int z_ElementSetName(ODR o, char **p, int opt)
return opt;
return
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT,
- 120, 1) &&
+ 120, 0) &&
odr_implicit(o, odr_integer, &(*p)->attributeValue, ODR_CONTEXT,
- 121, 1) &&
+ 121, 0) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
{-1, -1, -1, -1, 0}
};
{
if (o->direction == ODR_DECODE)
*p = nalloc(o, sizeof(**p));
- if (odr_sequence_of(o, z_NamePlusRecordList, &(*p)->records,
+ if (odr_sequence_of(o, z_NamePlusRecord, &(*p)->records,
&(*p)->num_records))
return 1;
*p = 0;