Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/id.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/id.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/coreutils/id.c

@@ -11 +11 @@
 /* Hacked by Tito Ragusa (C) 2004 to handle usernames of whatever length and to
  * be more similar to GNU id.
+ * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  */
 
-#include "busybox.h"
-#include "pwd_.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#ifdef CONFIG_SELINUX
-#include <selinux/selinux.h>          /* for is_selinux_enabled() */
-#endif
+#include "libbb.h"
 
 #define PRINT_REAL        1
@@ -27 +20 @@
 #define JUST_USER         4
 #define JUST_GROUP        8
+#if ENABLE_SELINUX
+#define JUST_CONTEXT     16
+#endif
 
-static short printf_full(unsigned int id, const char *arg, const char prefix)
+static int printf_full(unsigned int id, const char *arg, const char prefix)
 {
     const char *fmt = "%cid=%u";
-    short status=EXIT_FAILURE;
+    int status = EXIT_FAILURE;
 
-    if(arg) {
+    if (arg) {
         fmt = "%cid=%u(%s)";
-        status=EXIT_SUCCESS;
+        status = EXIT_SUCCESS;
     }
-    bb_printf(fmt, prefix, id, arg);
+    printf(fmt, prefix, id, arg);
     return status;
 }
 
+int id_main(int argc, char **argv);
 int id_main(int argc, char **argv)
 {
@@ -48 +45 @@
     unsigned long flags;
     short status;
-
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
     /* Don't allow -n -r -nr -ug -rug -nug -rnug */
     /* Don't allow more than one username */
-    bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
-    flags = bb_getopt_ulflags(argc, argv, "rnug");
+    opt_complementary = "?1:u--g:g--u:r?ug:n?ug" USE_SELINUX(":u--Z:Z--u:g--Z:Z--g");
+    flags = getopt32(argv, "rnug" USE_SELINUX("Z"));
 
     /* This values could be overwritten later */
@@ -62 +61 @@
     }
 
-    if(argv[optind]) {
-        p=getpwnam(argv[optind]);
-        /* bb_xgetpwnam is needed because it exits on failure */
-        uid = bb_xgetpwnam(argv[optind]);
+    if (argv[optind]) {
+        p = getpwnam(argv[optind]);
+        /* xuname2uid is needed because it exits on failure */
+        uid = xuname2uid(argv[optind]);
         gid = p->pw_gid;
         /* in this case PRINT_REAL is the same */
     }
 
-    if(flags & (JUST_GROUP | JUST_USER)) {
+    if (flags & (JUST_GROUP | JUST_USER USE_SELINUX(| JUST_CONTEXT))) {
         /* JUST_GROUP and JUST_USER are mutually exclusive */
-        if(flags & NAME_NOT_NUMBER) {
-            /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */
-            puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
+        if (flags & NAME_NOT_NUMBER) {
+            /* bb_getXXXid(-1) exit on failure, puts cannot segfault */
+            puts((flags & JUST_USER) ? bb_getpwuid(NULL, -1, uid) : bb_getgrgid(NULL, -1, gid));
         } else {
-            bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
+            if (flags & JUST_USER) {
+                printf("%u\n", uid);
+            }
+            if (flags & JUST_GROUP) {
+                printf("%u\n", gid);
+            }
         }
+
+#if ENABLE_SELINUX
+        if (flags & JUST_CONTEXT) {
+            selinux_or_die();
+            if (argc - optind == 1) {
+                bb_error_msg_and_die("user name can't be passed with -Z");
+            }
+
+            if (getcon(&scontext)) {
+                bb_error_msg_and_die("can't get process context");
+            }
+            printf("%s\n", scontext);
+        }
+#endif
         /* exit */
-        bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
     }
 
     /* Print full info like GNU id */
-    /* bb_getpwuid doesn't exit on failure here */
-    status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
+    /* bb_getpwuid(0) doesn't exit on failure (returns NULL) */
+    status = printf_full(uid, bb_getpwuid(NULL, 0, uid), 'u');
     putchar(' ');
-    /* bb_getgrgid doesn't exit on failure here */
-    status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+    status |= printf_full(gid, bb_getgrgid(NULL, 0, gid), 'g');
 
-#ifdef CONFIG_SELINUX
-    if ( is_selinux_enabled() ) {
-            security_context_t mysid;
-            char context[80];
-            int len = sizeof(context);
+#if ENABLE_SELINUX
+    if (is_selinux_enabled()) {
+        security_context_t mysid;
+        const char *context;
 
-            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);
+        context = "unknown";
+        getcon(&mysid);
+        if (mysid) {
+            context = alloca(strlen(mysid) + 1);
+            strcpy((char*)context, mysid);
+            freecon(mysid);
+        }
+        printf(" context=%s", context);
     }
 #endif
 
     putchar('\n');
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }