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

Pass an actual empty environment to execle() as per POSIX rather than

Browse Source 
rely on undocumented behavior.

The following fixes were obtained from OpenBSD:

  o -Wall fixes to tlist array initialization and assignment used
    as truth value.
  o Use a restricted environment.
  o Improved error message when shutdown fails to exec reboot or halt.
This commit is contained in:
Alexander Langer 1998-01-10 20:11:06 +00:00
parent 1f48070a27
commit f6faa785f2
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sbin/shutdown/shutdown.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: shutdown.c,v 1.10 1998/01/08 02:23:59 alex Exp $ * $Id: shutdown.c,v 1.11 1998/01/08 20:05:45 alex Exp $
*/ */
#ifndef lint #ifndef lint
@ -73,10 +73,18 @@ static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
struct interval { struct interval {
int timeleft, timetowait; int timeleft, timetowait;
} tlist[] = { } tlist[] = {
10 H, 5 H, 5 H, 3 H, 2 H, 1 H, 1 H, 30 M, { 10 H, 5 H },
30 M, 10 M, 20 M, 10 M, 10 M, 5 M, 5 M, 3 M, { 5 H, 3 H },
2 M, 1 M, 1 M, 30 S, 30 S, 30 S, { 2 H, 1 H },
0, 0, { 1 H, 30 M },
{ 30 M, 10 M },
{ 20 M, 10 M },
{ 10 M, 5 M },
{ 5 M, 3 M },
{ 2 M, 1 M },
{ 1 M, 30 S },
{ 30 S, 30 S },
{ 0 , 0 }
}; };
#undef H #undef H
#undef M #undef M
@ -226,7 +234,7 @@ loop()
* Warn now, if going to sleep more than a fifth of * Warn now, if going to sleep more than a fifth of
* the next wait time. * the next wait time.
*/ */
if (sltime = offset - tp->timeleft) { if ((sltime = offset - tp->timeleft)) {
if (sltime > tp->timetowait / 5) if (sltime > tp->timetowait / 5)
timewarn(offset); timewarn(offset);
(void)sleep(sltime); (void)sleep(sltime);
@ -247,6 +255,11 @@ loop()
static jmp_buf alarmbuf; static jmp_buf alarmbuf;
static char *restricted_environ[] = {
"PATH=" _PATH_STDPATH,
NULL
};
void void
timewarn(timeleft) timewarn(timeleft)
int timeleft; int timeleft;
@ -255,12 +268,14 @@ timewarn(timeleft)
static char hostname[MAXHOSTNAMELEN + 1]; static char hostname[MAXHOSTNAMELEN + 1];
FILE *pf; FILE *pf;
char wcmd[MAXPATHLEN + 4]; char wcmd[MAXPATHLEN + 4];
extern char **environ;
if (!first++) if (!first++)
(void)gethostname(hostname, sizeof(hostname)); (void)gethostname(hostname, sizeof(hostname));
/* undoc -n option to wall suppresses normal wall banner */ /* undoc -n option to wall suppresses normal wall banner */
(void)snprintf(wcmd, sizeof(wcmd), "%s -n", _PATH_WALL); (void)snprintf(wcmd, sizeof(wcmd), "%s -n", _PATH_WALL);
environ = restricted_environ;
if (!(pf = popen(wcmd, "w"))) { if (!(pf = popen(wcmd, "w"))) {
syslog(LOG_ERR, "shutdown: can't find %s: %m", _PATH_WALL); syslog(LOG_ERR, "shutdown: can't find %s: %m", _PATH_WALL);
return; return;
@ -307,6 +322,7 @@ timeout(signo)
void void
die_you_gravy_sucking_pig_dog() die_you_gravy_sucking_pig_dog()
{ {
char *empty_environ[] = { NULL };
syslog(LOG_NOTICE, "%s by %s: %s", syslog(LOG_NOTICE, "%s by %s: %s",
doreboot ? "reboot" : dohalt ? "halt" : "shutdown", whom, mbuf); doreboot ? "reboot" : dohalt ? "halt" : "shutdown", whom, mbuf);
@ -327,14 +343,16 @@ die_you_gravy_sucking_pig_dog()
(void)printf("\nkill -HUP 1\n"); (void)printf("\nkill -HUP 1\n");
#else #else
if (doreboot) { if (doreboot) {
execle(_PATH_REBOOT, "reboot", "-l", nosync, NULL, NULL); execle(_PATH_REBOOT, "reboot", "-l", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_REBOOT); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_REBOOT);
perror("shutdown"); warn(_PATH_REBOOT);
} }
else if (dohalt) { else if (dohalt) {
execle(_PATH_HALT, "halt", "-l", nosync, NULL, NULL); execle(_PATH_HALT, "halt", "-l", nosync,
(char *)NULL, empty_environ);
syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_HALT); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_HALT);
perror("shutdown"); warn(_PATH_HALT);
} }
(void)kill(1, SIGTERM); /* to single user */ (void)kill(1, SIGTERM); /* to single user */
#endif #endif