[Firebird-checkins] SF.net SVN: firebird:[54381] firebird/branches/B2_5_Release/src/remote/inet .cpp

[<hv...@us...>]

Revision: 54381
          http://firebird.svn.sourceforge.net/firebird/?rev=54381&view=rev
Author:   hvlad
Date:     2012-04-16 15:16:31 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Fixed bug CORE-3819 : Wrong service name to port address resolution in database connection string

Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/remote/inet.cpp

Modified: firebird/branches/B2_5_Release/src/remote/inet.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/remote/inet.cpp	2012-04-14 05:25:29 UTC (rev 54380)
+++ firebird/branches/B2_5_Release/src/remote/inet.cpp	2012-04-16 15:16:31 UTC (rev 54381)
@@ -851,6 +851,12 @@
 	}
 #endif // WIN_NT
 
+	// Make sure getservbyname returns the protocol we searched for.
+	// See also bug CORE-3819.
+
+	if (service && stricmp(service->s_name, protocol.c_str()))
+		service = NULL;
+
 	// Modification by luz (slightly modified by FSG)
 	// instead of failing here, try applying hard-wired
 	// translation of "gds_db" into "3050"

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