From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 20 Jun 2006 21:20:51 +0000 (+0000)
Subject: Fixed option negotation for Frontend server . Option triggerResourceCtrl
X-Git-Tag: YAZ.2.1.26~56
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=e87b70ae77aed9a47ee29f69ce2c531fddf394ce

Fixed option negotation for Frontend server . Option triggerResourceCtrl
was always set in response options. Should only be set if option is
also set in client options.
---

diff --git a/src/seshigh.c b/src/seshigh.c
index 6e683f4..768e22a 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.86 2006-06-15 12:53:58 adam Exp $
+ * $Id: seshigh.c,v 1.87 2006-06-20 21:20:51 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -2249,7 +2249,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
         strcat(options, " negotiation");
     }
         
-    ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
+    if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
+        ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
 
     if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
     {
@@ -2287,7 +2288,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.86 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.87 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,