#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);
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 */
*
* @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;
*
* \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;
* \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;
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));
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) {