diff options
| author | peter <peter@FreeBSD.org> | 1995-12-15 13:31:51 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-12-15 13:31:51 +0000 |
| commit | da723b7aea961a5a21dea5be297a4eb780faf736 (patch) | |
| tree | be097f1c058de668b9db7add989a780d73008050 /usr.sbin | |
| parent | 8f1d0708f1f66254f4ef4efaa4358ea4ae8d596f (diff) | |
| download | FreeBSD-src-da723b7aea961a5a21dea5be297a4eb780faf736.zip FreeBSD-src-da723b7aea961a5a21dea5be297a4eb780faf736.tar.gz | |
Revert from fiddling with the PS_STRINGS pointers back to the traditional
spamming of the argv, almost back to the original code (except for NULL
padding of the string).
This makes this version of the sendmail source compile on 2.1.X again.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sendmail/src/conf.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sendmail/src/conf.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c index c0a3a27..b6cb178 100644 --- a/usr.sbin/sendmail/src/conf.c +++ b/usr.sbin/sendmail/src/conf.c @@ -1558,7 +1558,7 @@ getla() /* Non Apollo stuff removed by Don Lewis 11/15/93 */ #ifndef lint -static char rcsid[] = "@(#)$Id: conf.c,v 1.9 1995/12/06 07:56:45 peter Exp $"; +static char rcsid[] = "@(#)$Id: conf.c,v 1.10 1995/12/09 05:01:24 peter Exp $"; #endif /* !lint */ #ifdef apollo @@ -1833,8 +1833,7 @@ setproctitle(fmt, va_alist) # endif # if SPT_TYPE == SPT_PSSTRINGS PS_STRINGS->ps_nargvstr = 1; - PS_STRINGS->ps_argvstr[0] = buf; - PS_STRINGS->ps_argvstr[1] = 0; + PS_STRINGS->ps_argvstr = buf; # endif # if SPT_TYPE == SPT_SYSMIPS sysmips(SONY_SYSNEWS, NEWS_SETPSARGS, buf); diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h index d0402bd..c1c24a0 100644 --- a/usr.sbin/sendmail/src/conf.h +++ b/usr.sbin/sendmail/src/conf.h @@ -595,7 +595,9 @@ typedef int pid_t; # define setreuid __setreuid # endif # if defined(__FreeBSD__) -# define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS->... */ +# undef SPT_TYPE +# define SPT_TYPE SPT_REUSEARGV +# define SPT_PADCHAR '\0' /* pad process title with nulls */ # endif #endif |
