diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2009-06-20 18:24:29 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2009-06-20 18:24:29 +0000 |
commit | 5255c009ddc3aeb9dfbb662711750c75c5d26fec (patch) | |
tree | b8a2d88f4027df0def150ea5d39e6a0466d4bde8 | |
parent | c28aedefd8bbb49b9a32d1167c28b6a40cd4e266 (diff) | |
download | src-5255c009ddc3aeb9dfbb662711750c75c5d26fec.tar.gz src-5255c009ddc3aeb9dfbb662711750c75c5d26fec.zip |
Restore the check against running as root that I accidentally removed in
r194493.
Notes
Notes:
svn path=/head/; revision=194548
-rw-r--r-- | usr.bin/catman/catman.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c index 347e00845aeb..ba3ad248a2c2 100644 --- a/usr.bin/catman/catman.c +++ b/usr.bin/catman/catman.c @@ -91,6 +91,7 @@ static const char *locale_device[] = { #define GZCAT_CMD "z" enum Ziptype {NONE, BZIP, GZIP}; +static uid_t uid; static int starting_dir; static char tmp_file[MAXPATHLEN]; struct stat test_st; @@ -742,6 +743,14 @@ main(int argc, char **argv) { int opt; + if ((uid = getuid()) == 0) { + fprintf(stderr, "don't run %s as root, use:\n echo", argv[0]); + for (optind = 0; optind < argc; optind++) { + fprintf(stderr, " %s", argv[optind]); + } + fprintf(stderr, " | nice -5 su -m man\n"); + exit(1); + } while ((opt = getopt(argc, argv, "vnfLrh")) != -1) { switch (opt) { case 'f': |