From 44bcea66542e398fcada22ba9cb24d07bd8e04ef Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Aug 2010 03:12:19 +0200 Subject: [PATCH] log: SCM_CREDENTIALS will be added by the kernel anyway, so there's no need to write them manually --- src/log.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/log.c b/src/log.c index 3c42e8e5..21fc9f4f 100644 --- a/src/log.c +++ b/src/log.c @@ -248,11 +248,6 @@ static int write_to_syslog( char header_priority[16], header_time[64], header_pid[16]; struct iovec iovec[5]; struct msghdr msghdr; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; - } control; - struct ucred *ucred; time_t t; struct tm *tm; @@ -279,21 +274,9 @@ static int write_to_syslog( IOVEC_SET_STRING(iovec[3], header_pid); IOVEC_SET_STRING(iovec[4], buffer); - zero(control); - control.cmsghdr.cmsg_level = SOL_SOCKET; - control.cmsghdr.cmsg_type = SCM_CREDENTIALS; - control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); - - ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); - ucred->pid = getpid(); - ucred->uid = getuid(); - ucred->gid = getgid(); - zero(msghdr); msghdr.msg_iov = iovec; msghdr.msg_iovlen = ELEMENTSOF(iovec); - msghdr.msg_control = &control; - msghdr.msg_controllen = control.cmsghdr.cmsg_len; if (sendmsg(syslog_fd, &msghdr, MSG_NOSIGNAL) < 0) return -errno; -- 2.39.5