]> git.tuebingen.mpg.de Git - paraslash.git/blobdiff - net.c
recv_cred_buffer typo: Return proper error number
[paraslash.git] / net.c
diff --git a/net.c b/net.c
index 0a0d80348d3e4c4ec172b70929c5d7e99164c6a1..599930aa11628a36c6cb4317823c816b12a242db 100644 (file)
--- a/net.c
+++ b/net.c
@@ -20,9 +20,9 @@
 
 #include "para.h"
 #include "net.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);
@@ -73,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 */
@@ -130,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;
@@ -415,7 +415,7 @@ 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