user/4951: Sendmail: diff to make submit.cf honour /etc/mail/trusted-users

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

user/4951: Sendmail: diff to make submit.cf honour /etc/mail/trusted-users

Stuart Henderson-2
>Number:         4951
>Category:       user
>Synopsis:       Sendmail: diff to make submit.cf honour /etc/mail/trusted-users
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    bugs
>State:          open
>Quarter:        
>Keywords:      
>Date-Required:
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 22 11:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Stuart Henderson
>Release:        current
>Organization:
net
>Environment:
       
        System      : OpenBSD 3.8
        Architecture: OpenBSD.i386
        Machine     : i386
>Description:
/etc/mail/trusted-users is only honoured by the MTA not the MSA,
so it's not read in most situations where it's needed.

>How-To-Repeat:
$ echo whoami | sudo sh -c "cat >> /etc/mail/trusted-users"
$ sudo kill -HUP `head -1 /var/run/sendmail.pid`
$ echo "test"|sendmail -f'[hidden email]' `whoami`
- examine headers in received mail.

>Fix:
New file /usr/src/gnu/usr.sbin/sendmail/cf/cf/openbsd-submit.mc to
avoid clobbering when the new release is imported:

divert(-1)
#
# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
#

#
#  This is the prototype file for a set-group-ID sm-msp sendmail that
#  acts as a initial mail submission program.
#

divert(0)dnl
VERSIONID(`$Sendmail: submit.mc,v 8.13 2003/09/10 22:12:48 ca Exp $')
define(`confCF_VERSION', `Submit')dnl
define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
define(`confTIME_ZONE', `USE_TZ')dnl
define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
define(`confDONT_INIT_GROUPS', `True')dnl
define(`confCT_FILE', `-o MAIL_SETTINGS_DIR`'trusted-users')dnl
FEATURE(`use_ct_file')dnl
FEATURE(`accept_unresolvable_domains')dnl
FEATURE(`msp', `[127.0.0.1]')dnl




Index: /usr/src/gnu/usr.sbin/sendmail/cf/cf//Makefile
===================================================================
RCS file: /data/cvs/OpenBSD/src/gnu/usr.sbin/sendmail/cf/cf/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- /usr/src/gnu/usr.sbin/sendmail/cf/cf//Makefile 16 Dec 2004 00:21:29 -0000 1.21
+++ /usr/src/gnu/usr.sbin/sendmail/cf/cf//Makefile 22 Dec 2005 10:10:31 -0000
@@ -31,7 +31,7 @@
 
 ALL= submit.cf clientproto.cf tcpproto.cf openbsd-localhost.cf \
  openbsd-proto.cf courtesan.cf courtesan-nonet.cf openbsd-lists.cf \
- openbsd-bulk.cf lucifier.cf corpse.cf knecht.cf
+ openbsd-bulk.cf lucifier.cf corpse.cf knecht.cf openbsd-submit.cf
 
 all: $(ALL)
 
@@ -55,12 +55,12 @@
  fi; \
  fi
 
-distribution: openbsd-proto.cf openbsd-localhost.cf submit.cf
+distribution: openbsd-proto.cf openbsd-localhost.cf openbsd-submit.cf
  ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 openbsd-proto.cf \
     ${DESTDIR}/etc/mail/sendmail.cf
  ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 openbsd-localhost.cf \
     ${DESTDIR}/etc/mail/localhost.cf
- ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 submit.cf \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 openbsd-submit.cf \
     ${DESTDIR}/etc/mail/submit.cf
 
 # this is overkill, but....


>Release-Note:
>Audit-Trail:
>Unformatted: