* fix warning message
* don't warn if netlink messages from other processes have been received
* don't access ucreds before checking cmsg validity
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1382
941a03a8-eaeb-0310-b9a0-
b1bbd8fe43fe
iov.iov_base = nl->buffer;
iov.iov_len = nl->buffer_length;
iov.iov_base = nl->buffer;
iov.iov_len = nl->buffer_length;
- smsg.msg_name = (void*) NULL;
smsg.msg_namelen = 0;
smsg.msg_iov = &iov;
smsg.msg_iovlen = 1;
smsg.msg_namelen = 0;
smsg.msg_iov = &iov;
smsg.msg_iovlen = 1;
}
cmsg = CMSG_FIRSTHDR(&smsg);
}
cmsg = CMSG_FIRSTHDR(&smsg);
- cred = (struct ucred *) CMSG_DATA (cmsg);
- if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
- avahi_log_error("No sender credentials received, ignoring data.");
+ if (!cmsg || cmsg->cmsg_type != SCM_CREDENTIALS) {
+ avahi_log_warn("No sender credentials received, ignoring data.");
- if (cred->uid != 0) {
- avahi_log_warn("Netlink message received from cred->uid != 0 (%d)", cred->uid);
+ cred = (struct ucred*) CMSG_DATA(cmsg);
+
+ if (cred->uid != 0)
p = (struct nlmsghdr *) nl->buffer;
p = (struct nlmsghdr *) nl->buffer;
}
if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
}
if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
- avahi_log_error(__FILE__": bind(): %s", strerror(errno));
+ avahi_log_error(__FILE__": SO_PASSCRED: %s", strerror(errno));