X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevmonitor.c;h=75e39481a02a3ff3773b215a6741766745acd0e0;hp=d04cb0dcd32604863db75cfbf98105a22710b0ab;hb=fbb002f9d31c76f9445c4c16b3b88b11e34f8e86;hpb=0d2516c3366066e0758f2c5a26d94f41df518e76

diff --git a/udevmonitor.c b/udevmonitor.c
index d04cb0dcd..75e39481a 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -43,7 +43,6 @@ static int init_udev_monitor_socket(void)
 {
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
-	const int feature_on = 1;
 	int retval;
 
 	memset(&saddr, 0x00, sizeof(saddr));
@@ -67,9 +66,6 @@ static int init_udev_monitor_socket(void)
 		return -1;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
 	return 0;
 }
 
@@ -127,7 +123,7 @@ static const char *search_key(const char *searchkey, const char *buf, size_t buf
 	return NULL;
 }
 
-int main(int argc, char *argv[])
+int udevmonitor(int argc, char *argv[], char *envp[])
 {
 	struct sigaction act;
 	int option;
@@ -161,7 +157,7 @@ int main(int argc, char *argv[])
 			udev = 1;
 			break;
 		case 'h':
-			printf("Usage: udevmonitor [--environment] [--kernel] [--udev] [--help]\n"
+			printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
 			       "  --env    print the whole event environment\n"
 			       "  --kernel print kernel uevents\n"
 			       "  --udev   print udev events\n"
@@ -194,13 +190,13 @@ int main(int argc, char *argv[])
 		retval = init_udev_monitor_socket();
 		if (retval)
 			goto out;
-		printf("UEVENT the kernel uevent\n");
+		printf("UDEV the event which udev sends out after rule processing\n");
 	}
 	if (kernel) {
 		retval = init_uevent_netlink_sock();
 		if (retval)
 			goto out;
-		printf("UDEV the event which udev sends out after rule processing\n");
+		printf("UEVENT the kernel uevent\n");
 	}
 	printf("\n");