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
This commit is contained in:
parent
8f80f103b4
commit
a35353de88
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227269
@ -63,6 +63,8 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include "panic.h"
|
#include "panic.h"
|
||||||
#include "parsetime.h"
|
#include "parsetime.h"
|
||||||
#include "perm.h"
|
#include "perm.h"
|
||||||
|
|
||||||
|
#define MAIN
|
||||||
#include "privs.h"
|
#include "privs.h"
|
||||||
|
|
||||||
/* Macros */
|
/* Macros */
|
||||||
@ -102,8 +104,6 @@ int fcreated;
|
|||||||
char atfile[] = ATJOB_DIR "12345678901234";
|
char atfile[] = ATJOB_DIR "12345678901234";
|
||||||
char atverify = 0; /* verify time instead of queuing job */
|
char atverify = 0; /* verify time instead of queuing job */
|
||||||
char *namep;
|
char *namep;
|
||||||
uid_t real_uid, effective_uid;
|
|
||||||
gid_t real_gid, effective_gid;
|
|
||||||
|
|
||||||
/* Function declarations */
|
/* Function declarations */
|
||||||
|
|
||||||
|
@ -59,8 +59,15 @@
|
|||||||
* to the real userid before calling any of them.
|
* to the real userid before calling any of them.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern uid_t real_uid, effective_uid;
|
#ifndef MAIN
|
||||||
extern gid_t real_gid, effective_gid;
|
extern
|
||||||
|
#endif
|
||||||
|
uid_t real_uid, effective_uid;
|
||||||
|
|
||||||
|
#ifndef MAIN
|
||||||
|
extern
|
||||||
|
#endif
|
||||||
|
gid_t real_gid, effective_gid;
|
||||||
|
|
||||||
#define RELINQUISH_PRIVS { \
|
#define RELINQUISH_PRIVS { \
|
||||||
real_uid = getuid(); \
|
real_uid = getuid(); \
|
||||||
|
Loading…
Reference in New Issue
Block a user