diff options
| author | ed <ed@FreeBSD.org> | 2011-11-06 20:30:21 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2011-11-06 20:30:21 +0000 |
| commit | b57deea6eb18ec218ca0abae94f25fc951fa7a7a (patch) | |
| tree | 1e68f149ac2b40477dddee71bbfec1c76e77aef8 /usr.bin/at | |
| parent | 637fddd99966303c683109ca5fe108ce7241799d (diff) | |
| download | FreeBSD-src-b57deea6eb18ec218ca0abae94f25fc951fa7a7a.zip FreeBSD-src-b57deea6eb18ec218ca0abae94f25fc951fa7a7a.tar.gz | |
Partially revert r227233.
The privs.h header is not only used by at(1), it's also used by
atrun(8). Just let the code the way it used to be (for now).
Reported by: kwm, tinderbox
Hat to: me
Diffstat (limited to 'usr.bin/at')
| -rw-r--r-- | usr.bin/at/at.c | 4 | ||||
| -rw-r--r-- | usr.bin/at/privs.h | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index 283965e..cb2fadb 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -63,6 +63,8 @@ __FBSDID("$FreeBSD$"); #include "panic.h" #include "parsetime.h" #include "perm.h" + +#define MAIN #include "privs.h" /* Macros */ @@ -102,8 +104,6 @@ int fcreated; char atfile[] = ATJOB_DIR "12345678901234"; char atverify = 0; /* verify time instead of queuing job */ char *namep; -uid_t real_uid, effective_uid; -gid_t real_gid, effective_gid; /* Function declarations */ diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h index c84f277..50dd6b1 100644 --- a/usr.bin/at/privs.h +++ b/usr.bin/at/privs.h @@ -59,8 +59,15 @@ * to the real userid before calling any of them. */ -extern uid_t real_uid, effective_uid; -extern gid_t real_gid, effective_gid; +#ifndef MAIN +extern +#endif +uid_t real_uid, effective_uid; + +#ifndef MAIN +extern +#endif +gid_t real_gid, effective_gid; #define RELINQUISH_PRIVS { \ real_uid = getuid(); \ |
