X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=4d2f520f23170aef7f84e4aeea52c43616400266;hp=59b8616a56be2cd0dec066a5c431d3fbea9cab43;hb=002e302f18b73e57e8a5ff5e9dc97c68bb85216d;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/net.c b/net.c
index 59b8616a..4d2f520f 100644
--- a/net.c
+++ b/net.c
@@ -20,10 +20,9 @@
 
 #include "para.h"
 #include "net.h"
-#include "gcc-compat.h"
+#include "string.h"
 #include <netdb.h>
 #include "error.h"
-#include "string.h"
 
 extern void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
 extern void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
@@ -74,7 +73,7 @@ static int sendall(int fd, const char *buf, size_t *len)
 		total += n;
 		bytesleft -= n;
 		if (total < *len)
-			PARA_DEBUG_LOG("short write (%d byte(s) left)",
+			PARA_DEBUG_LOG("short write (%zd byte(s) left)",
 				*len - total);
 	}
 	*len = total; /* return number actually sent here */
@@ -131,7 +130,7 @@ int send_buffer(int fd, const char *buf)
  *
  * @return Positive on success, \p -E_SEND on errors.
  */
-__printf_2_3 int send_va_buffer(int fd, char *fmt, ...)
+__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...)
 {
 	char *msg;
 	int ret;
@@ -254,7 +253,7 @@ int para_connect(int fd, struct sockaddr_in *their_addr)
  *
  * \sa accept(2).
  */
-int para_accept(int fd, void *addr, size_t size)
+int para_accept(int fd, void *addr, socklen_t size)
 {
 	int new_fd;
 
@@ -393,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;
@@ -404,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));
@@ -416,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) {