summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1995-12-06 07:56:47 +0000
committerpeter <peter@FreeBSD.org>1995-12-06 07:56:47 +0000
commit7c98c9da0a471c7f32577295085df835f208a2e9 (patch)
tree1ed7903dfa2ef017ade0378d12c933805bbc4ad6 /usr.sbin
parenta32045a9de967adcb942e7c3d4c121e79f140e01 (diff)
downloadFreeBSD-src-7c98c9da0a471c7f32577295085df835f208a2e9.zip
FreeBSD-src-7c98c9da0a471c7f32577295085df835f208a2e9.tar.gz
Make sendmail's setproctitle() use PS_STRINGS rather than smash
the argv. It appears that this once didn't work, but now it seems to work just fine.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sendmail/src/conf.c6
-rw-r--r--usr.sbin/sendmail/src/conf.h3
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
index ee47763..0f47773 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.7 1995/05/30 03:52:08 rgrimes Exp $";
+static char rcsid[] = "@(#)$Id: conf.c,v 1.8 1995/12/02 18:17:13 peter Exp $";
#endif /* !lint */
#ifdef apollo
@@ -1704,10 +1704,6 @@ refuseconnections()
# if SPT_TYPE == SPT_PSSTRINGS
# include <machine/vmparam.h>
# include <sys/exec.h>
-# ifdef __FreeBSD__
-# undef PS_STRINGS /* XXX This is broken due to needing<machine/pmap.h> */
-# define PROCTITLEPAD '\0'
-# endif
# ifndef PS_STRINGS /* hmmmm.... apparently not available after all */
# undef SPT_TYPE
# define SPT_TYPE SPT_REUSEARGV
diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h
index 9ac4d8f..d0402bd 100644
--- a/usr.sbin/sendmail/src/conf.h
+++ b/usr.sbin/sendmail/src/conf.h
@@ -594,6 +594,9 @@ typedef int pid_t;
# define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */
# define setreuid __setreuid
# endif
+# if defined(__FreeBSD__)
+# define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS->... */
+# endif
#endif
OpenPOWER on IntegriCloud