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);
+
/**
* initialize a struct sockaddr_in
* @param addr A pointer to the struct to be initialized
{
int n;
- if ((n = recv_bin_buffer(fd, buf, size - 1)) >= 0)
+ n = recv_bin_buffer(fd, buf, size - 1);
+ if (n >= 0)
buf[n] = '\0';
+ else
+ *buf = '\0';
return n;
}
return fd;
}
+#ifndef HAVE_UCRED
+ struct ucred {
+ uid_t uid, pid, gid;
+};
+ssize_t send_cred_buffer(int sock, char *buf)
+{
+ return send_buffer(sock, buf);
+}
+int recv_cred_buffer(int fd, char *buf, size_t size)
+{
+ return recv_buffer(fd, buf, size) > 0? 1 : -E_RECVMSG;
+}
+#else /* HAVE_UCRED */
/**
* send NULL terminated buffer and Unix credentials of the current process
*
* \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;
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) {
}
return result;
}
+#endif /* HAVE_UCRED */
/** how many pending connections queue will hold */
#define BACKLOG 10
* \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)
if (n < len)
goto out;
- buf[n] = '\0';
if (strncasecmp(buf, pattern, len))
goto out;
ret = 1;
out:
+ if (ret < 0)
+ PARA_NOTICE_LOG("did not receive pattern '%s'\n", pattern);
free(buf);
return ret;
}