summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-08-22 16:09:27 +0000
committerAndrew Tridgell <tridge@samba.org>1996-08-22 16:09:27 +0000
commit69a458ba2c4fbd3e880b724dd07a7b1e32cdb4dc (patch)
tree157c37493438f2e7b1ce37a6032f5e0590a6b060 /source3
parent86c72d5e88fffe18f85ee97e8c2bd14ec277d0f1 (diff)
downloadsamba-69a458ba2c4fbd3e880b724dd07a7b1e32cdb4dc.tar.gz
samba-69a458ba2c4fbd3e880b724dd07a7b1e32cdb4dc.tar.bz2
samba-69a458ba2c4fbd3e880b724dd07a7b1e32cdb4dc.zip
- fix client for pathworks 4 access
- fix "connection already connected" bug in open_socket_out() (This used to be commit fcce452557a6f5cfc46972617ed6932bb7fbeb95)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/client.c6
-rw-r--r--source3/lib/util.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index cc178967a1..cdf33a14b3 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -168,7 +168,7 @@ void setup_pkt(char *outbuf)
SSVAL(outbuf,smb_pid,pid);
SSVAL(outbuf,smb_uid,uid);
SSVAL(outbuf,smb_mid,mid);
- if (Protocol > PROTOCOL_CORE)
+ if (Protocol > PROTOCOL_COREPLUS)
{
SCVAL(outbuf,smb_flg,0x8);
SSVAL(outbuf,smb_flg2,0x1);
@@ -3316,7 +3316,7 @@ static BOOL send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setu
strcpy(pword, ""); passlen=1;
}
- if (Protocol <= PROTOCOL_CORE) {
+ if (Protocol <= PROTOCOL_COREPLUS) {
set_message(outbuf,0,6 + strlen(service) + passlen + strlen(dev),True);
CVAL(outbuf,smb_com) = SMBtcon;
setup_pkt(outbuf);
@@ -3376,7 +3376,7 @@ static BOOL send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setu
}
- if (Protocol <= PROTOCOL_CORE) {
+ if (Protocol <= PROTOCOL_COREPLUS) {
max_xmit = SVAL(inbuf,smb_vwv0);
cnum = SVAL(inbuf,smb_vwv1);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index e13a4c37e8..31ad3da31c 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2888,6 +2888,13 @@ connect_again:
return -1;
}
+#ifdef EISCONN
+ if (ret < 0 && errno == EISCONN) {
+ errno = 0;
+ ret = 0;
+ }
+#endif
+
if (ret < 0) {
DEBUG(2,("error connecting to %s:%d (%s)\n",
inet_ntoa(*addr),port,strerror(errno)));