X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=4d2f520f23170aef7f84e4aeea52c43616400266;hb=b7cbaf0b4dc832e8277b5867505dac59bb803d44;hp=66d19fd4617111e13a00c3c4850223d945689abb;hpb=09e1e9039b42f00bcfa64091700d611931618bca;p=paraslash.git

diff --git a/net.c b/net.c
index 66d19fd4..4d2f520f 100644
--- a/net.c
+++ b/net.c
@@ -392,10 +392,12 @@ static void dispose_fds(int *fds, int num)
  * \param size the size of \a buffer
  * \param cred the credentials are returned here
  *
+ * \return negative on errors, the user id on success.
+ *
  * \sa okir's Black Hats Manual
  * \sa recvmsg(2)
  */
-int recv_cred_buffer(int fd, char *buf, size_t size, struct ucred *cred)
+int recv_cred_buffer(int fd, char *buf, size_t size)
 {
 	char control[255];
 	struct msghdr msg;
@@ -403,6 +405,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size, struct ucred *cred)
 	struct iovec iov;
 	int result;
 	int yes = 1;
+	struct ucred cred;
 
 	setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &yes, sizeof(int));
 	memset(&msg, 0, sizeof(msg));
@@ -415,13 +418,13 @@ int recv_cred_buffer(int fd, char *buf, size_t size, struct ucred *cred)
 	msg.msg_controllen = sizeof(control);
 	if (recvmsg(fd, &msg, 0) < 0)
 		return -E_RECVMSG;
-	result = -SCM_CREDENTIALS;
+	result = -E_SCM_CREDENTIALS;
 	cmsg = CMSG_FIRSTHDR(&msg);
 	while (cmsg) {
 		if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type
 				== SCM_CREDENTIALS) {
-			memcpy(cred, CMSG_DATA(cmsg), sizeof(struct ucred));
-			result = iov.iov_len;
+			memcpy(&cred, CMSG_DATA(cmsg), sizeof(struct ucred));
+			result = cred.uid;
 		} else
 			if (cmsg->cmsg_level == SOL_SOCKET
 					&& cmsg->cmsg_type == SCM_RIGHTS) {