summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/smrsh
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2003-02-08 20:35:51 +0000
committergshapiro <gshapiro@FreeBSD.org>2003-02-08 20:35:51 +0000
commit55f617e6f03e9e96b121cdde8289102d3a460b4e (patch)
treee9e902fe45cc13b5eeb0f81f2aa041f4296bdd54 /contrib/sendmail/smrsh
parent7bd0c4fe894c9bc5e90bb93736d3d0f84dc7a7dc (diff)
downloadFreeBSD-src-55f617e6f03e9e96b121cdde8289102d3a460b4e.zip
FreeBSD-src-55f617e6f03e9e96b121cdde8289102d3a460b4e.tar.gz
Resolve conflicts from sendmail 8.12.7 import
Diffstat (limited to 'contrib/sendmail/smrsh')
-rw-r--r--contrib/sendmail/smrsh/smrsh.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c
index 74365e3..4bb461d 100644
--- a/contrib/sendmail/smrsh/smrsh.c
+++ b/contrib/sendmail/smrsh/smrsh.c
@@ -22,7 +22,7 @@ SM_IDSTR(copyright,
Copyright (c) 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.58 2002/05/25 02:41:31 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.58.2.2 2002/09/24 21:40:05 ca Exp $")
/*
** SMRSH -- sendmail restricted shell
@@ -292,12 +292,12 @@ main(argc, argv)
{
/* too long */
(void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
- "%s: %s not available for sendmail programs (filename too long)\n",
+ "%s: \"%s\" not available for sendmail programs (filename too long)\n",
prg, cmd);
if (p != NULL)
*p = ' ';
#ifndef DEBUG
- syslog(LOG_CRIT, "uid %d: attempt to use %s (filename too long)",
+ syslog(LOG_CRIT, "uid %d: attempt to use \"%s\" (filename too long)",
(int) getuid(), cmd);
#endif /* ! DEBUG */
exit(EX_UNAVAILABLE);
@@ -311,12 +311,12 @@ main(argc, argv)
{
/* can't stat it */
(void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
- "%s: %s not available for sendmail programs (stat failed)\n",
+ "%s: \"%s\" not available for sendmail programs (stat failed)\n",
prg, cmd);
if (p != NULL)
*p = ' ';
#ifndef DEBUG
- syslog(LOG_CRIT, "uid %d: attempt to use %s (stat failed)",
+ syslog(LOG_CRIT, "uid %d: attempt to use \"%s\" (stat failed)",
(int) getuid(), cmd);
#endif /* ! DEBUG */
exit(EX_UNAVAILABLE);
@@ -329,12 +329,12 @@ main(argc, argv)
{
/* can't stat it */
(void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
- "%s: %s not available for sendmail programs (not a file)\n",
+ "%s: \"%s\" not available for sendmail programs (not a file)\n",
prg, cmd);
if (p != NULL)
*p = ' ';
#ifndef DEBUG
- syslog(LOG_CRIT, "uid %d: attempt to use %s (not a file)",
+ syslog(LOG_CRIT, "uid %d: attempt to use \"%s\" (not a file)",
(int) getuid(), cmd);
#endif /* ! DEBUG */
exit(EX_UNAVAILABLE);
@@ -343,12 +343,12 @@ main(argc, argv)
{
/* oops.... crack attack possiblity */
(void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
- "%s: %s not available for sendmail programs\n",
+ "%s: \"%s\" not available for sendmail programs\n",
prg, cmd);
if (p != NULL)
*p = ' ';
#ifndef DEBUG
- syslog(LOG_CRIT, "uid %d: attempt to use %s",
+ syslog(LOG_CRIT, "uid %d: attempt to use \"%s\"",
(int) getuid(), cmd);
#endif /* ! DEBUG */
exit(EX_UNAVAILABLE);
OpenPOWER on IntegriCloud