[Firebird-checkins] SF.net SVN: firebird:[57958] firebird/trunk/src/remote/client/interface.cpp

[<ale...@us...>]

Revision: 57958
          http://sourceforge.net/p/firebird/code/57958
Author:   alexpeshkoff
Date:     2013-04-16 08:54:48 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Fixed assertion in services when talking to pre-FB3 server

Modified Paths:
--------------
    firebird/trunk/src/remote/client/interface.cpp

Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2013-04-16 01:16:25 UTC (rev 57957)
+++ firebird/trunk/src/remote/client/interface.cpp	2013-04-16 08:54:48 UTC (rev 57958)
@@ -7297,18 +7297,21 @@
  **************************************/
 
 	// Get ready for multi-hop auth
+	ClntAuthBlock cBlock(NULL, NULL, NULL);
+	cBlock.loadServiceDataFrom(rdb->rdb_port);
+
 	ClumpletWriter send(ClumpletReader::SpbStart, MAX_DPB_SIZE, items, item_length);
 	if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION13)
 	{
 		// This is FB < 3.0. Lets convert the UTF8 strings to the OS codepage.
 		IntlSpbStart().fromUtf8(send, 0);
 	}
+	else
+	{
+		HANDSHAKE_DEBUG(fprintf(stderr, "start calls authFillParametersBlock\n"));
+		authFillParametersBlock(cBlock, send, &spbStartParam, rdb->rdb_port);
+	}
 
-	ClntAuthBlock cBlock(NULL, NULL, NULL);
-	cBlock.loadServiceDataFrom(rdb->rdb_port);
-	HANDSHAKE_DEBUG(fprintf(stderr, "start calls authFillParametersBlock\n"));
-	authFillParametersBlock(cBlock, send, &spbStartParam, rdb->rdb_port);
-
 	// Build the primary packet to get the operation started.
 	PACKET* packet = &rdb->rdb_packet;
 	packet->p_operation = operation;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.