From e87b70ae77aed9a47ee29f69ce2c531fddf394ce Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 20 Jun 2006 21:20:51 +0000 Subject: [PATCH] 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. --- src/seshigh.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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, -- 1.7.10.4