[dovecot-cvs] dovecot/src/lib fdpass.c,1.10,1.11

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv14312/lib

Modified Files:
	fdpass.c 
Log Message:
fd_read() fixes, hopefully works better now.



Index: fdpass.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/fdpass.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fdpass.c	28 Dec 2002 19:57:53 -0000	1.10
+++ fdpass.c	6 Jan 2003 11:34:40 -0000	1.11
@@ -97,16 +97,17 @@
 	msg.msg_iovlen = 1;
 
 	msg.msg_control = buf;
-	msg.msg_controllen = CMSG_LEN(sizeof(int));
-
-	cmsg = CMSG_FIRSTHDR(&msg);
-	cmsg->cmsg_level = SOL_SOCKET;
-	cmsg->cmsg_type = SCM_RIGHTS;
+	msg.msg_controllen = sizeof(buf);
 
 	ret = recvmsg(handle, &msg, 0);
-	if (msg.msg_controllen != CMSG_LEN(sizeof(int)))
+	if (ret <= 0)
+		return ret;
+
+	/* at least one byte transferred - we should have the fd now */
+	cmsg = CMSG_FIRSTHDR(&msg);
+	if (cmsg == NULL)
 		*fd = -1;
 	else
-		*fd = *(int *) CMSG_DATA(cmsg);
+		*fd = *((int *) CMSG_DATA(cmsg));
 	return ret;
 }