X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fid.c;h=971e7cdad6949e00bca908830992fedd414ddf25;hb=637d2266e1ea711f27ab0aec200a196b5eccbbca;hp=6af6774040ef2f9e26f398294d424bc7b8321ad8;hpb=99e370f0c655b24a44c7ebba7c35a36e6b6bd285;p=oweals%2Fbusybox.git

diff --git a/coreutils/id.c b/coreutils/id.c
index 6af677404..971e7cdad 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -2,7 +2,6 @@
 /*
  * Mini id implementation for busybox
  *
- *
  * Copyright (C) 2000 by Randolph Chung <tausq@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,69 +20,91 @@
  *
  */
 
-#include "internal.h"
+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -G is not currently supported. */
+
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
 #include <getopt.h>
+#include <string.h>
 #include <sys/types.h>
+#ifdef CONFIG_SELINUX
+#include <proc_secure.h>
+#include <flask_util.h>
+#endif
+
+#define JUST_USER         1
+#define JUST_GROUP        2
+#define PRINT_REAL        4
+#define NAME_NOT_NUMBER   8
 
 extern int id_main(int argc, char **argv)
 {
-	int no_user = 0, no_group = 0, print_real = 0;
-	char *cp, *user, *group;
-	unsigned long gid;
-	int opt;
+	char user[9], group[9];
+	long pwnam, grnam;
+	int uid, gid;
+	int flags;
+#ifdef CONFIG_SELINUX
+	int is_flask_enabled_flag = is_flask_enabled();
+#endif
 	
-	cp = user = group = NULL;
+	flags = bb_getopt_ulflags(argc, argv, "ugrn");
 
-	while ((opt = getopt(argc, argv, "ugr")) > 0) {
-		switch (opt) {
-			case 'u':
-				no_group++;
-				break;
-			case 'g':
-				no_user++;
-				break;
-			case 'r':
-				print_real++;
-				break;
-			default:
-				usage(id_usage);
-		}
+	if (((flags & (JUST_USER | JUST_GROUP)) == (JUST_USER | JUST_GROUP))
+		|| (argc > optind + 1)
+	) {
+		bb_show_usage();
 	}
 
-	if (no_user && no_group) usage(id_usage);
-
-	user = argv[optind];
-
-	if (user == NULL) {
-		user = xmalloc(9);
-		group = xmalloc(9);
-		if (print_real) {
-			my_getpwuid(user, getuid());
-			my_getgrgid(group, getgid());
+	if (argv[optind] == NULL) {
+		if (flags & PRINT_REAL) {
+			uid = getuid();
+			gid = getgid();
 		} else {
-			my_getpwuid(user, geteuid());
-			my_getgrgid(group, getegid());
+			uid = geteuid();
+			gid = getegid();
 		}
+		my_getpwuid(user, uid);
 	} else {
-		group = xmalloc(9);
+		safe_strncpy(user, argv[optind], sizeof(user));
 	    gid = my_getpwnamegid(user);
-		my_getgrgid(group, gid);
 	}
+	my_getgrgid(group, gid);
 
-	if (no_group)
-		printf("%lu\n", my_getpwnam(user));
-	else if (no_user)
-		printf("%lu\n", my_getgrnam(group));
-	else
-		printf("uid=%lu(%s) gid=%lu(%s)\n",
-				my_getpwnam(user), user, my_getgrnam(group), group);
+	pwnam=my_getpwnam(user);
+	grnam=my_getgrnam(group);
 
-	return(0);
-}
+	if (flags & (JUST_GROUP | JUST_USER)) {
+		char *s = group;
+		if (flags & JUST_USER) {
+			s = user;
+			grnam = pwnam;
+		}
+		if (flags & NAME_NOT_NUMBER) {
+			puts(s);
+		} else {
+			printf("%ld\n", grnam);
+		}
+	} else {
+#ifdef CONFIG_SELINUX
+		printf("uid=%ld(%s) gid=%ld(%s)", pwnam, user, grnam, group);
+		if(is_flask_enabled_flag)
+		{
+			security_id_t mysid = getsecsid();
+			char context[80];
+			int len = sizeof(context);
+			context[0] = '\0';
+			if(security_sid_to_context(mysid, context, &len))
+				strcpy(context, "unknown");
+			printf(" context=%s\n", context);
+		}
+		else
+			printf("\n");
+#else
+		printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
+#endif
 
+	}
 
-/* END CODE */
+	bb_fflush_stdout_and_exit(0);
+}