From: markus schnalke Date: Fri, 3 Feb 2012 17:42:55 +0000 (+0100) Subject: Removed the last masquerading type: username_extension. X-Git-Tag: mmh-thesis-end~373 X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=2abae0bfd0ad5bf898461e50aa4b466d641f23d9 Removed the last masquerading type: username_extension. If you want some username extension, then change the From: line in the message draft. If you want real masquerading, then consult your MTA. mmh is an MUA, no MTA. (spost hadn't supported username_extension maquerading, anyway.) --- diff --git a/INSTALL b/INSTALL index 4057535..d4bd38f 100644 --- a/INSTALL +++ b/INSTALL @@ -63,7 +63,7 @@ need an ANSI C compiler such as gcc. on the local machine. Check the `mts.conf(5)' man page for a list of all the available - options for this file ("masquerade" may be of particular interest). + options for this file. 6) Edit the file `mhn.defaults' (installed in the mmh `etc' directory). This file contains the default profile entries for the mmh commands @@ -149,15 +149,6 @@ Options for configure --enable-debug Enable debugging support. ---enable-masquerade[='username_extension'] - If this option is disabled, the mts.conf file will contain the - line "masquerade: " (with no value), which may be manually edited - later. You may find it convenient to specify a value at - configure-time, however, so that each time mmh is reinstalled, - the right value will be there. By default, it is enabled. - - See the mh-tailor(5) man page for full documentation of "masquerade:". - --enable-mhe (DEFAULT) Add support for the Emacs front-end `mhe'. diff --git a/configure.ac b/configure.ac index 8b23986..a6a55ef 100644 --- a/configure.ac +++ b/configure.ac @@ -45,17 +45,6 @@ if test x"$enable_nmh_debug" = x"yes"; then enable_debug=yes fi -dnl Allow users to send email from addresses other than their default? -AC_ARG_ENABLE(masquerade, - AS_HELP_STRING([--enable-masquerade='username_extension'], - [enable up to 3 types of address masquerading]), - [if test x"$enable_masquerade" = x"yes"; then - masquerade="username_extension" - else - masquerade="$enable_masquerade" - fi], [masquerade="username_extension"]) -AC_SUBST(masquerade)dnl - dnl Do you want mhe support? AC_ARG_ENABLE(mhe, AS_HELP_STRING([--disable-mhe],[disable mhe support])) @@ -837,5 +826,4 @@ sendmail path : ${sendmailpath} mail spool : ${mailspool} file locking type : ${LOCKTYPE} -address masquerading : ${masquerade} " diff --git a/etc/Makefile.in b/etc/Makefile.in index 1216177..0c7736d 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -15,7 +15,6 @@ libdir = @libdir@ etcdir = @sysconfdir@ mailspool = @mailspool@ -masquerade = @masquerade@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -70,8 +69,7 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG) mts.conf: $(srcdir)/mts.conf.in Makefile rm -f $@ $(SED) -e 's,%mailspool%,$(mailspool),' \ - -e 's,%etcdir%,$(etcdir),' \ - -e 's,%masquerade%,$(masquerade),' < $(srcdir)/mts.conf.in > $@ + -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@ sendfiles: $(srcdir)/sendfiles.in Makefile rm -f $@ diff --git a/etc/mts.conf.in b/etc/mts.conf.in index 725a76b..ca31e0c 100644 --- a/etc/mts.conf.in +++ b/etc/mts.conf.in @@ -1,10 +1,6 @@ # # nmh mail transport interface customization file. # -# Check the mh-tailor(5) man page for a list of -# all the available options for this file. +# Check the mh-tailor(5) man page for information. # - -# The following directive allows email address masquerading. The string -# "username_extension" is the default. -masquerade: %masquerade% +# maildelivery is the only available option. diff --git a/man/mh-tailor.man5 b/man/mh-tailor.man5 index 5918714..e3a949a 100644 --- a/man/mh-tailor.man5 +++ b/man/mh-tailor.man5 @@ -31,37 +31,6 @@ will send messages by forking a local copy of .BR sendmail . .PP -.BR masquerade: -.RS 5 -This directive controls email address masquerading. -The possible value is \*(lqusername_extension\*(rq. -.PP -If specified and if the user sets the -.B $USERNAME_EXTENSION -environment variable, its value will be appended to the actual login name. For -instance, if I am \*(lqdan@company.com\*(rq, and I set -.B $USERNAME_EXTENSION -to \*(lq\-www\*(rq, my mail will appear to come from \*(lqdan\-www@company.com\*(rq. This is meant -to interact with qmail's \*(lquser\-extension\*(rq feature, where mail sent to -.IR user \- string -will be delivered to -.IR user . -Likewise, those using -versions of sendmail for which \*(lqplussed user\*(rq processing is active can set -.B $USERNAME_EXTENSION -to \*(lq+\fIstring\fR\*(rq. These MTA features are useful -because they allow one to use different email addresses in different situations -(to aid in automatic mail filtering or in determining where spammers got one's -address) while only actually having a single account. Note that -.B $USERNAME_EXTENSION -is only appended to the username when \fIpost\fR is -generating \*(lq[Resent\-]From:\*(rq lines and the SMTP envelope -\*(lqFrom:\*(rq. -.BR inc , -for instance, will not try to read from a maildrop file called \*(lqdan\-www\*(rq (to -recall the earlier example). -.PP -In any case: When a user explicitly specifies a \*(lqFrom:\*(rq header in a draft, .B nmh uses it diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index 4cc0006..4059ce0 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -73,9 +73,6 @@ static char err[BUFSIZ]; static char adr[BUFSIZ]; -extern boolean username_extension_masquerading; /* defined in mts.c */ - - /* ** external prototypes */ diff --git a/sbr/mts.c b/sbr/mts.c index 313cbbc..503ec3c 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -41,10 +41,6 @@ static char *mtsconf = NMHETCDIR"/mts.conf"; static char username[BUFSIZ]; static char fullname[BUFSIZ]; -/* Variables for username masquerading: */ -boolean username_extension_masquerading = FALSE; /* " from addrsbr.c */ -static char* masquerade = ""; - /* ** Global MailDelivery file */ @@ -61,7 +57,6 @@ struct bind { }; static struct bind binds[] = { - { "masquerade", &masquerade }, { "maildelivery", &maildelivery }, { NULL, NULL } }; @@ -90,9 +85,6 @@ mts_init(char *name) mts_read_conf_file(fp); fclose(fp); } - - if (strstr(masquerade, "username_extension") != NULL) - username_extension_masquerading = TRUE; }