nm4 2009/11/12 08:34:23 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dcc.c
Log:
Correct connect() call in dcc code. Fixes: #909
Revision Changes Path
1.590 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.5 +2 -3 exim/exim-src/src/dcc.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -r1.589 -r1.590
--- ChangeLog 9 Nov 2009 10:22:10 -0000 1.589
+++ ChangeLog 12 Nov 2009 08:34:23 -0000 1.590
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.589 2009/11/09 10:22:10 nm4 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.590 2009/11/12 08:34:23 nm4 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -151,6 +151,8 @@
NM/35 Bugzilla 39: Base64 decode bug fixes
Patch by Jakob Hirsch
+NM/36 Bugzilla 909: Correct connect() call in dcc code
+
Exim version 4.69
-----------------
Index: dcc.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dcc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dcc.c 11 Nov 2009 10:08:01 -0000 1.4
+++ dcc.c 12 Nov 2009 08:34:23 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dcc.c,v 1.4 2009/11/11 10:08:01 nm4 Exp $ */
+/* $Cambridge: exim/exim-src/src/dcc.c,v 1.5 2009/11/12 08:34:23 nm4 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -59,7 +59,7 @@
uschar *xtra_hdrs = NULL;
/* from local_scan */
- int i, j, k, c, retval, sockfd, servlen, resp, line;
+ int i, j, k, c, retval, sockfd, resp, line;
unsigned int portnr;
struct sockaddr_un serv_addr;
struct sockaddr_in serv_addr_in;
@@ -219,7 +219,6 @@
bzero((char *)&serv_addr,sizeof(serv_addr));
serv_addr.sun_family = AF_UNIX;
Ustrcpy(serv_addr.sun_path, sockpath);
- servlen = Ustrlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
if ((sockfd = socket(AF_UNIX, SOCK_STREAM,0)) < 0){
DEBUG(D_acl)
debug_printf("Creating socket failed: %s\n", strerror(errno));
@@ -229,7 +228,7 @@
return retval;
}
/* Now connecting the socket (UNIX) */
- if (connect(sockfd, (struct sockaddr *) &serv_addr, servlen) < 0){
+ if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0){
DEBUG(D_acl)
debug_printf("Connecting socket failed: %s\n", strerror(errno));
log_write(0,LOG_REJECT,"Connecting socket failed: %s\n", strerror(errno));
