Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/coreutils/id.c

    r821 r1770  
    1111/* Hacked by Tito Ragusa (C) 2004 to handle usernames of whatever length and to
    1212 * be more similar to GNU id.
     13 * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
    1314 */
    1415
    15 #include "busybox.h"
    16 #include "pwd_.h"
    17 #include <stdio.h>
    18 #include <unistd.h>
    19 #include <sys/types.h>
    20 
    21 #ifdef CONFIG_SELINUX
    22 #include <selinux/selinux.h>          /* for is_selinux_enabled() */
    23 #endif
     16#include "libbb.h"
    2417
    2518#define PRINT_REAL        1
     
    2720#define JUST_USER         4
    2821#define JUST_GROUP        8
     22#if ENABLE_SELINUX
     23#define JUST_CONTEXT     16
     24#endif
    2925
    30 static short printf_full(unsigned int id, const char *arg, const char prefix)
     26static int printf_full(unsigned int id, const char *arg, const char prefix)
    3127{
    3228    const char *fmt = "%cid=%u";
    33     short status=EXIT_FAILURE;
     29    int status = EXIT_FAILURE;
    3430
    35     if(arg) {
     31    if (arg) {
    3632        fmt = "%cid=%u(%s)";
    37         status=EXIT_SUCCESS;
     33        status = EXIT_SUCCESS;
    3834    }
    39     bb_printf(fmt, prefix, id, arg);
     35    printf(fmt, prefix, id, arg);
    4036    return status;
    4137}
    4238
     39int id_main(int argc, char **argv);
    4340int id_main(int argc, char **argv)
    4441{
     
    4845    unsigned long flags;
    4946    short status;
    50 
     47#if ENABLE_SELINUX
     48    security_context_t scontext;
     49#endif
    5150    /* Don't allow -n -r -nr -ug -rug -nug -rnug */
    5251    /* Don't allow more than one username */
    53     bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
    54     flags = bb_getopt_ulflags(argc, argv, "rnug");
     52    opt_complementary = "?1:u--g:g--u:r?ug:n?ug" USE_SELINUX(":u--Z:Z--u:g--Z:Z--g");
     53    flags = getopt32(argv, "rnug" USE_SELINUX("Z"));
    5554
    5655    /* This values could be overwritten later */
     
    6261    }
    6362
    64     if(argv[optind]) {
    65         p=getpwnam(argv[optind]);
    66         /* bb_xgetpwnam is needed because it exits on failure */
    67         uid = bb_xgetpwnam(argv[optind]);
     63    if (argv[optind]) {
     64        p = getpwnam(argv[optind]);
     65        /* xuname2uid is needed because it exits on failure */
     66        uid = xuname2uid(argv[optind]);
    6867        gid = p->pw_gid;
    6968        /* in this case PRINT_REAL is the same */
    7069    }
    7170
    72     if(flags & (JUST_GROUP | JUST_USER)) {
     71    if (flags & (JUST_GROUP | JUST_USER USE_SELINUX(| JUST_CONTEXT))) {
    7372        /* JUST_GROUP and JUST_USER are mutually exclusive */
    74         if(flags & NAME_NOT_NUMBER) {
    75             /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */
    76             puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
     73        if (flags & NAME_NOT_NUMBER) {
     74            /* bb_getXXXid(-1) exit on failure, puts cannot segfault */
     75            puts((flags & JUST_USER) ? bb_getpwuid(NULL, -1, uid) : bb_getgrgid(NULL, -1, gid));
    7776        } else {
    78             bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
     77            if (flags & JUST_USER) {
     78                printf("%u\n", uid);
     79            }
     80            if (flags & JUST_GROUP) {
     81                printf("%u\n", gid);
     82            }
    7983        }
     84
     85#if ENABLE_SELINUX
     86        if (flags & JUST_CONTEXT) {
     87            selinux_or_die();
     88            if (argc - optind == 1) {
     89                bb_error_msg_and_die("user name can't be passed with -Z");
     90            }
     91
     92            if (getcon(&scontext)) {
     93                bb_error_msg_and_die("can't get process context");
     94            }
     95            printf("%s\n", scontext);
     96        }
     97#endif
    8098        /* exit */
    81         bb_fflush_stdout_and_exit(EXIT_SUCCESS);
     99        fflush_stdout_and_exit(EXIT_SUCCESS);
    82100    }
    83101
    84102    /* Print full info like GNU id */
    85     /* bb_getpwuid doesn't exit on failure here */
    86     status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
     103    /* bb_getpwuid(0) doesn't exit on failure (returns NULL) */
     104    status = printf_full(uid, bb_getpwuid(NULL, 0, uid), 'u');
    87105    putchar(' ');
    88     /* bb_getgrgid doesn't exit on failure here */
    89     status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
     106    status |= printf_full(gid, bb_getgrgid(NULL, 0, gid), 'g');
    90107
    91 #ifdef CONFIG_SELINUX
    92     if ( is_selinux_enabled() ) {
    93             security_context_t mysid;
    94             char context[80];
    95             int len = sizeof(context);
     108#if ENABLE_SELINUX
     109    if (is_selinux_enabled()) {
     110        security_context_t mysid;
     111        const char *context;
    96112
    97             getcon(&mysid);
    98             context[0] = '\0';
    99             if (mysid) {
    100                     len = strlen(mysid)+1;
    101                     safe_strncpy(context, mysid, len);
    102                     freecon(mysid);
    103             }else{
    104                     safe_strncpy(context, "unknown",8);
    105             }
    106         bb_printf(" context=%s", context);
     113        context = "unknown";
     114        getcon(&mysid);
     115        if (mysid) {
     116            context = alloca(strlen(mysid) + 1);
     117            strcpy((char*)context, mysid);
     118            freecon(mysid);
     119        }
     120        printf(" context=%s", context);
    107121    }
    108122#endif
    109123
    110124    putchar('\n');
    111     bb_fflush_stdout_and_exit(status);
     125    fflush_stdout_and_exit(status);
    112126}
Note: See TracChangeset for help on using the changeset viewer.