summaryrefslogtreecommitdiffstats
path: root/usr.bin/catman
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2009-06-20 18:24:29 +0000
committerbrooks <brooks@FreeBSD.org>2009-06-20 18:24:29 +0000
commitee06a4e9e182a88140a7d22f8cb5d3ddb021cc79 (patch)
treeb8a2d88f4027df0def150ea5d39e6a0466d4bde8 /usr.bin/catman
parent63b3afd8279370cfffb63e0c1490eeef93823870 (diff)
downloadFreeBSD-src-ee06a4e9e182a88140a7d22f8cb5d3ddb021cc79.zip
FreeBSD-src-ee06a4e9e182a88140a7d22f8cb5d3ddb021cc79.tar.gz
Restore the check against running as root that I accidentally removed in
r194493.
Diffstat (limited to 'usr.bin/catman')
-rw-r--r--usr.bin/catman/catman.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c
index 347e008..ba3ad24 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':
OpenPOWER on IntegriCloud