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

WARNS=2 type cleanup.

Browse Source 
WARNS=2 cannot be enable because of an unresolvable conflict in arg 2
of execv(). Document this in the Makefile.

Reviewed by:	bde (su.c only)
This commit is contained in:
markm 2001-08-11 14:22:32 +00:00
parent 384d536a12
commit 69d76f8cf4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/su/Makefile
View File

@ -6,6 +6,10 @@ PROG= su
DPADD+= ${LIBUTIL} ${LIBPAM}
LDADD+= -lutil ${MINUSLPAM}
# Cannot be enabled because of a truly nasty warning/problem
# concering execv(2)'s second argument.
#WARNS?= 2
BINMODE=4555
INSTALLFLAGS=-fschg

10
usr.bin/su/su.c
View File

@ -67,7 +67,7 @@ static const char rcsid[] =
#include <security/pam_appl.h>
#include <security/pam_misc.h>
#define PAM_END do { \
#define PAM_END() do { \
int local_ret; \
if (pamh != NULL && creds_set) { \
local_ret = pam_setcred(pamh, PAM_DELETE_CRED); \
@ -120,9 +120,9 @@ main(int argc, char *argv[])
gid_t gid;
int asme, ch, asthem, fastlogin, prio, i, setwhat, retcode,
statusp, child_pid, child_pgrp, ret_pid;
char *p, *user, *shell, *username, *cleanenv, **nargv, **np,
*class, *mytty, shellbuf[MAXPATHLEN],
char *username, *cleanenv, *class, shellbuf[MAXPATHLEN],
myhost[MAXHOSTNAMELEN + 1];
const char *p, *user, *shell, *mytty, **nargv, **np;
shell = class = cleanenv = NULL;
asme = asthem = fastlogin = statusp = 0;
@ -325,11 +325,11 @@ main(int argc, char *argv[])
}
if (ret_pid == -1)
err(1, "waitpid");
PAM_END;
PAM_END();
exit(statusp);
case -1:
err(1, "fork");
PAM_END;
PAM_END();
exit(1);
case 0:
/*