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

Revoke privs once at earlier stage and not mess with setegid in save

Browse Source 
Fix save: missing creation modes arg and wrong symlink test
Small C cleanup
This commit is contained in:
ache 1997-09-24 09:42:33 +00:00
parent 94b4fc0286
commit 2aa9215694
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
games/battlestar/battlestar.c
View File

@ -60,8 +60,7 @@ char **argv;
open_score_file();
/* revoke privs. */
egid = getegid();
setegid(getgid());
setgid(getgid());
initialize(argc < 2 || strcmp(argv[1], "-r"));
start:

16
games/battlestar/save.c
View File

@ -39,12 +39,12 @@ static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
#include <sys/stat.h>
#include <sys/param.h> /* MAXPATHLEN */
#include <fcntl.h>
#include <stdlib.h>
#include "externs.h"
void
restore()
{
char *getenv();
char *home;
char home1[MAXPATHLEN];
register int n;
@ -55,13 +55,10 @@ restore()
sprintf(home1, "%.*s/Bstar", MAXPATHLEN - 7, home);
else return;
setegid(egid);
if ((fp = fopen(home1, "r")) == 0) {
perror(home1);
setegid(getgid());
return;
}
setegid(getgid());
fread(&WEIGHT, sizeof WEIGHT, 1, fp);
fread(&CUMBER, sizeof CUMBER, 1, fp);
fread(&gclock, sizeof gclock, 1, fp);
@ -103,7 +100,6 @@ void
save()
{
struct stat sbuf;
char *getenv();
char *home;
char home1[MAXPATHLEN];
register int n;
@ -115,36 +111,30 @@ save()
return;
sprintf(home1, "%.*s/Bstar", MAXPATHLEN - 7, home);
setegid(egid);
/* Try to open the file safely. */
if (stat(home1, &sbuf) < 0) {
fd = open(home1, O_WRONLY|O_CREAT|O_EXCL);
fd = open(home1, O_WRONLY|O_CREAT|O_EXCL, 0600);
if (fd < 0) {
fprintf(stderr, "Can't create %s\n", home1);
setegid(getgid());
return;
}
} else {
if (sbuf.st_mode & S_IFLNK) {
if ((sbuf.st_mode & S_IFLNK) == S_IFLNK) {
fprintf(stderr, "No symlinks!\n");
setegid(getgid());
return;
}
fd = open(home1, O_WRONLY|O_EXCL);
if (fd < 0) {
fprintf(stderr, "Can't open %s for writing\n", home1);
setegid(getgid());
return;
}
}
if ((fp = fdopen(fd, "w")) == 0) {
perror(home1);
setegid(getgid());
return;
}
setegid(getgid());
printf("Saved in %s.\n", home1);
fwrite(&WEIGHT, sizeof WEIGHT, 1, fp);