#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);
+
+#ifndef HAVE_UCRED
+ struct ucred {
+ uid_t uid, pid, gid;
+};
+#endif /* HAVE_UCRED */
+
/**
* initialize a struct sockaddr_in
* @param addr A pointer to the struct to be initialized
*
* @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;
msg.msg_iovlen = 1;
msg.msg_control = control;
msg.msg_controllen = sizeof(control);
+#ifdef HAVE_UCRED
/* attach the ucred struct */
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
*(struct ucred *)CMSG_DATA(cmsg) = c;
msg.msg_controllen = cmsg->cmsg_len;
+#endif
ret = sendmsg(sock, &msg, 0);
if (ret < 0)
ret = -E_SENDMSG;
* \param fd the socket file descriptor
* \param buf the buffer to store the message
* \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 cmsghdr *cmsg;
struct iovec iov;
- int result;
+ int result = 0;
int yes = 1;
+ struct ucred cred;
+#ifdef HAVE_UCRED
setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &yes, sizeof(int));
+#endif
memset(&msg, 0, sizeof(msg));
memset(buf, 0, size);
iov.iov_base = buf;
msg.msg_controllen = sizeof(control);
if (recvmsg(fd, &msg, 0) < 0)
return -E_RECVMSG;
- result = -SCM_CREDENTIALS;
+#ifdef HAVE_UCRED
+ 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) {
}
cmsg = CMSG_NXTHDR(&msg, cmsg);
}
+#endif
return result;
}
* \return The file descriptor of the created socket, negative
* on errors.
*
- * \sa get_socket()
+ * \sa get_socket()
* \sa setsockopt(2)
* \sa bind(2)
* \sa listen(2)