X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=ff61c656c872c3d834efef79f6be1604136f9953;hp=25ef857a8cc177f5099836ce73b0972bfdc7db50;hb=a2f87fddbfcb81f6f8f254b1a986a18f444212cf;hpb=1b75f1096e8fdf2ec5ab4ec112f20b69fbd084c3 diff --git a/udevd.c b/udevd.c index 25ef857a8..ff61c656c 100644 --- a/udevd.c +++ b/udevd.c @@ -551,7 +551,7 @@ static struct uevent_msg *get_udevd_msg(void) size = recvmsg(udevd_sock, &smsg, 0); if (size < 0) { if (errno != EINTR) - err("unable to receive udevd message: %s", strerror(errno)); + err("unable to receive user udevd message: %s", strerror(errno)); return NULL; } cmsg = CMSG_FIRSTHDR(&smsg); @@ -626,7 +626,7 @@ static struct uevent_msg *get_netlink_msg(void) size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0); if (size < 0) { if (errno != EINTR) - err("unable to receive udevd message: %s", strerror(errno)); + err("unable to receive kernel netlink message: %s", strerror(errno)); return NULL; } @@ -979,13 +979,8 @@ int main(int argc, char *argv[], char *envp[]) /* get user socket message */ if (FD_ISSET(udevd_sock, &readfds)) { msg = get_udevd_msg(); - if (msg) { - if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) { - info("skip non-kernel message with SEQNUM"); - free(msg); - } else - msg_queue_insert(msg); - } + if (msg) + msg_queue_insert(msg); } /* get kernel netlink message */