|
|
|
@ -156320,3 +156320,51 @@ index df16d6d..7d99eb9 100644
|
|
|
|
|
|
|
|
|
|
destfmt.datatype = bindcol->column_bindtype;
|
|
|
|
|
destfmt.maxlength = bindcol->column_bindlen;
|
|
|
|
|
|
|
|
|
|
commit 9ae2d1bee6d9152f4979ea0d44a2788b6e1cafb5
|
|
|
|
|
Author: freddy77 <freddy77>
|
|
|
|
|
Date: Sat Oct 2 07:07:16 2010 +0000
|
|
|
|
|
|
|
|
|
|
avoid udp 1434 probe if port specified (patch from SF case #3024141)
|
|
|
|
|
|
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
|
|
|
index a2d50e2..233e97a 100644
|
|
|
|
|
--- a/ChangeLog
|
|
|
|
|
+++ b/ChangeLog
|
|
|
|
|
@@ -1,3 +1,8 @@
|
|
|
|
|
+Sat Oct 2 09:07:11 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
|
|
|
|
|
+ * src/tds/login.c:
|
|
|
|
|
+ - avoid udp 1434 probe if port specified (patch from SF case
|
|
|
|
|
+ #3024141)
|
|
|
|
|
+
|
|
|
|
|
Fri Oct 1 10:28:46 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
|
|
|
|
|
* src/ctlib/ct.c: cleanup
|
|
|
|
|
|
|
|
|
|
@@ -2931,4 +2936,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
|
|
|
|
|
* ChangeLog-0.82 added because of release
|
|
|
|
|
|
|
|
|
|
$FreeTDS$
|
|
|
|
|
-$Id: ChangeLog,v 1.3138 2010/10/01 08:28:54 freddy77 Exp $
|
|
|
|
|
+$Id: ChangeLog,v 1.3139 2010/10/02 07:07:16 freddy77 Exp $
|
|
|
|
|
diff --git a/src/tds/login.c b/src/tds/login.c
|
|
|
|
|
index 8b94d41..b6b5734 100644
|
|
|
|
|
--- a/src/tds/login.c
|
|
|
|
|
+++ b/src/tds/login.c
|
|
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
|
#include <dmalloc.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-TDS_RCSID(var, "$Id: login.c,v 1.198 2010/07/30 07:29:48 freddy77 Exp $");
|
|
|
|
|
+TDS_RCSID(var, "$Id: login.c,v 1.199 2010/10/02 07:07:17 freddy77 Exp $");
|
|
|
|
|
|
|
|
|
|
static int tds_send_login(TDSSOCKET * tds, TDSCONNECTION * connection);
|
|
|
|
|
static int tds8_do_login(TDSSOCKET * tds, TDSCONNECTION * connection);
|
|
|
|
|
@@ -421,7 +421,7 @@ tds_connect(TDSSOCKET * tds, TDSCONNECTION * connection, int *p_oserr)
|
|
|
|
|
return TDSECONN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (!IS_TDS50(tds) && !tds_dstr_isempty(&connection->instance_name))
|
|
|
|
|
+ if (!IS_TDS50(tds) && !tds_dstr_isempty(&connection->instance_name) && !connection->port)
|
|
|
|
|
connection->port = tds7_get_instance_port(tds_dstr_cstr(&connection->ip_addr), tds_dstr_cstr(&connection->instance_name));
|
|
|
|
|
|
|
|
|
|
if (connection->port < 1) {
|
|
|
|
|