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

diff --git a/coreutils/id.c b/coreutils/id.c
index 6af677404..636049168 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,121 @@
  *
  */
 
-#include "internal.h"
+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -G is not currently supported. */
+/* Hacked by Tito Ragusa (C) 2004 to handle usernames of whatever length and to
+ * be more similar to GNU id. 
+ */
+
+#include "busybox.h"
+#include "pwd_.h"
 #include <stdio.h>
 #include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
-#include <getopt.h>
 #include <sys/types.h>
 
+#ifdef CONFIG_SELINUX
+#include <selinux/selinux.h>          /* for is_selinux_enabled() */
+#endif
+
+#define PRINT_REAL        1
+#define NAME_NOT_NUMBER   2
+#define JUST_USER         4
+#define JUST_GROUP        8
+
+static short printf_full(unsigned int id, const char *arg, const char prefix)
+{	
+	const char *fmt = "%cid=%u";
+	short status=EXIT_FAILURE;
+	
+	if(arg) {
+		fmt = "%cid=%u(%s)";
+		status=EXIT_SUCCESS;
+	}
+	bb_printf(fmt, prefix, id, arg);
+	return status;
+}
+
 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;
+	struct passwd *p;
+	uid_t uid;
+	gid_t gid;
+	unsigned long flags;
+	short status;
+
+	bb_opt_complementaly = "u~g:g~u";
+	flags = bb_getopt_ulflags(argc, argv, "rnug");
+
+	if ((flags & BB_GETOPT_ERROR)
+	/* Don't allow -n -r -nr */
+	|| (flags <= 3 && flags > 0) 
+	/* Don't allow more than one username */
+	|| (argc > optind + 1))
+		bb_show_usage();
 	
-	cp = user = group = NULL;
+	/* This values could be overwritten later */
+	uid = geteuid();
+	gid = getegid();
+	if (flags & PRINT_REAL) {
+		uid = getuid();
+		gid = getgid();
+	}
+	
+	if(argv[optind]) {
+		p=getpwnam(argv[optind]);
+		/* my_getpwnam is needed because it exits on failure */
+		uid = my_getpwnam(argv[optind]);
+		gid = p->pw_gid;
+		/* in this case PRINT_REAL is the same */ 
+	}
 
-	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_GROUP | JUST_USER)) {
+		/* JUST_GROUP and JUST_USER are mutually exclusive */
+		if(flags & NAME_NOT_NUMBER) {
+			/* my_getpwuid and my_getgrgid exit on failure so puts cannot segfault */
+			puts((flags & JUST_USER) ? my_getpwuid(NULL, uid, -1 ) : my_getgrgid(NULL, gid, -1 ));
+		} else {
+			bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
 		}
+		/* exit */ 
+		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
 
-	if (no_user && no_group) usage(id_usage);
+	/* Print full info like GNU id */
+	/* my_getpwuid doesn't exit on failure here */
+	status=printf_full(uid, my_getpwuid(NULL, uid, 0), 'u');
+	putchar(' ');
+	/* my_getgrgid doesn't exit on failure here */
+	status|=printf_full(gid, my_getgrgid(NULL, gid, 0), 'g');
 
-	user = argv[optind];
+#ifdef CONFIG_SELINUX
+	if ( is_selinux_enabled() ) {
+			security_context_t mysid;
+			char context[80];
+			int len = sizeof(context);
 
-	if (user == NULL) {
-		user = xmalloc(9);
-		group = xmalloc(9);
-		if (print_real) {
-			my_getpwuid(user, getuid());
-			my_getgrgid(group, getgid());
-		} else {
-			my_getpwuid(user, geteuid());
-			my_getgrgid(group, getegid());
-		}
-	} else {
-		group = xmalloc(9);
-	    gid = my_getpwnamegid(user);
-		my_getgrgid(group, gid);
+			getcon(&mysid);
+			context[0] = '\0';
+			if (mysid) {
+					len = strlen(mysid)+1;
+					safe_strncpy(context, mysid, len);
+					freecon(mysid);
+			}else{
+					safe_strncpy(context, "unknown",8);
+			}
+		bb_printf(" context=%s", context);
 	}
+#endif
 
-	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);
-
-	return(0);
+	putchar('\n');
+	bb_fflush_stdout_and_exit(status);
 }
 
-
 /* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
+