diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-03-14 14:26:35 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-03-14 14:26:35 +0000 |
| commit | 39da5de262f3f0965c723b747fbf11d7ed0a1ab6 (patch) | |
| tree | 523186c2927658896e455780edd8a469816e399a /usr.sbin/sendmail | |
| parent | c00d650f25e4b0f96f9ff12dcdf9db004a2510f2 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/sendmail')
| -rw-r--r-- | usr.sbin/sendmail/src/conf.h | 6 | ||||
| -rw-r--r-- | usr.sbin/sendmail/src/deliver.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h index 9c3904d24473..1e0b7654a891 100644 --- a/usr.sbin/sendmail/src/conf.h +++ b/usr.sbin/sendmail/src/conf.h @@ -710,12 +710,16 @@ typedef int pid_t; # endif # if defined(__FreeBSD__) # undef SPT_TYPE -# if __FreeBSD__ == 2 +# if __FreeBSD__ >= 2 # include <osreldate.h> /* and this works */ # if __FreeBSD_version >= 199512 /* 2.2-current right now */ # include <libutil.h> # define SPT_TYPE SPT_BUILTIN # endif +# if __FreeBSD_version >= 300000 /* 3.0-current right now */ +# include <login_cap.h> +# define HASSETUSERCONTEXT 1 /* BSDI-style login classes */ +# endif # endif # ifndef SPT_TYPE # define SPT_TYPE SPT_REUSEARGV diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c index 97a1050552ac..fb6db2dfa7fe 100644 --- a/usr.sbin/sendmail/src/deliver.c +++ b/usr.sbin/sendmail/src/deliver.c @@ -1539,7 +1539,7 @@ tryhost: pwd = sm_getpwnam(contextaddr->q_user); if (pwd != NULL) (void) setusercontext(NULL, - pwd, pwd->m_uid, + pwd, pwd->pw_uid, LOGIN_SETRESOURCES|LOGIN_SETPRIORITY); } #endif |