d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove setre* hacks, we have working thing now

Browse Source
This commit is contained in:
Andrey A. Chernov 1995-04-27 19:27:42 +00:00
parent 4bc8f31ff3
commit b5c3f5e746
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8112
2 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/at/at.c
View File

@ -80,7 +80,7 @@
/* File scope variables */
static char rcsid[] = "$Id: at.c,v 1.2 1995/04/12 02:42:28 ache Exp $";
static char rcsid[] = "$Id: at.c,v 1.3 1995/04/15 22:08:08 ache Exp $";
char *no_export[] =
{
"TERM", "TERMCAP", "DISPLAY", "_"
@ -250,6 +250,12 @@ writefile(time_t runtimer, char queue)
PRIV_END
/* We no longer need suid root; now we just need to be able to write
* to the directory, if necessary.
*/
REDUCE_PRIV(DAEMON_UID, DAEMON_GID)
/* We've successfully created the file; let's set the flag so it
* gets removed in case of an interrupt or error.
*/

57
usr.bin/at/privs.h
View File

@ -2,25 +2,19 @@
* privs.h - header for privileged operations
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. The name of the author(s) may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _PRIVS_H
@ -34,24 +28,6 @@
#include <unistd.h>
#endif
#ifdef __FreeBSD__
/*
* setre[ug]id() not change r[ug]id for FreeBSD, but check it incorrectly
* for this program
*/
#define setreuid(r, e) seteuid(e)
#define setregid(r, e) setegid(e)
#define SET_REAL_PRIV(a, b) {\
setgid(b); \
setuid(a); \
}
#else
#define SET_REAL_PRIV(a. b) {\
setregid((b), real_gid); \
setreuid((a), real_uid); \
}
#endif
/* Relinquish privileges temporarily for a setuid or setgid program
* with the option of getting them back later. This is done by swapping
* the real and effective userid BSD style. Call RELINQUISH_PRIVS once
@ -96,8 +72,8 @@ gid_t real_gid, effective_gid;
effective_uid = geteuid(); \
real_gid = getgid(); \
effective_gid = getegid(); \
setregid(effective_gid, real_gid); \
setreuid(effective_uid, real_uid); \
setregid(effective_gid, real_gid); \
}
#define RELINQUISH_PRIVS_ROOT(a,b) { \
@ -105,8 +81,8 @@ gid_t real_gid, effective_gid;
effective_uid = geteuid(); \
real_gid = (b); \
effective_gid = getegid(); \
setregid(effective_gid, real_gid); \
setreuid(effective_uid, real_uid); \
setregid(effective_gid, real_gid); \
}
#define PRIV_START {\
@ -114,8 +90,8 @@ gid_t real_gid, effective_gid;
setregid(real_gid, effective_gid);
#define PRIV_END \
setregid(effective_gid, real_gid); \
setreuid(effective_uid, real_uid); \
setregid(effective_gid, real_gid); \
}
#define REDUCE_PRIV(a,b) {\
@ -123,6 +99,7 @@ gid_t real_gid, effective_gid;
setregid(real_gid, effective_gid); \
effective_uid = (a); \
effective_gid = (b); \
SET_REAL_PRIV(a, b); \
setregid(effective_gid, real_gid); \
setreuid(effective_uid, real_uid); \
}
#endif