Flag to set from address in mail(1)

[martin]

Since the ability to pass arbitrary arguments to sendmail has been
removed from mail(1), I have added a variable and flag to pass a from
address to sendmail.

I considered making mail take the same arguments for this as it would
have when it was just passing onto sendmail but decided against that
because the code would be more complicated than necessary. But maybe
somebody wants the compatibility?

Thoughts?

-- Martin Brandenburg

Index: mail.1
===
RCS file: /cvs/src/usr.bin/mail/mail.1,v
retrieving revision 1.70
diff -u -p -r1.70 mail.1
--- mail.1  16 Dec 2014 18:37:17 -  1.70
+++ mail.1  4 Jan 2015 05:42:08 -
@@ -41,6 +41,7 @@
 .Nm mail
 .Bk -words
 .Op Fl dEIinv
+.Op Fl a Ar from
 .Op Fl b Ar list
 .Op Fl c Ar list
 .Op Fl s Ar subject
@@ -62,6 +63,11 @@ with lines replaced by messages.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl a Ar from
+Pass
+.Ar from
+to the mail delivery system as the from address.
+Overrides the from option below.
 .It Fl b Ar list
 Send blind carbon copies to
 .Ar list .
@@ -965,6 +971,14 @@ Causes
 .Nm mail
 to expand message recipient addresses, as explained in the section
 .Sx Recipient address specifications .
+.It Ar from
+Causes
+.Nm mail
+to pass a from address to the mail delivery system. If unset, no from
+address will be passed and the mail delivery system will use its default
+of user@host. This will be overriden if the
+.Fl a
+flag is set.
 .It Ar hold
 This option is used to hold messages in the system mailbox
 by default.
Index: main.c
===
RCS file: /cvs/src/usr.bin/mail/main.c,v
retrieving revision 1.26
diff -u -p -r1.26 main.c
--- main.c  16 Dec 2014 18:37:17 -  1.26
+++ main.c  4 Jan 2015 05:42:08 -
@@ -49,6 +49,7 @@ main(int argc, char **argv)
 {
int i;
struct name *to, *cc, *bcc, *smopts;
+   char *from = NULL;
char *subject;
char *ef;
char nosrc = 0;
@@ -78,7 +79,7 @@ main(int argc, char **argv)
bcc = NULL;
smopts = NULL;
subject = NULL;
-   while ((i = getopt(argc, argv, "EIN:b:c:dfins:u:v")) != -1) {
+   while ((i = getopt(argc, argv, "EIN:a:b:c:dfins:u:v")) != -1) {
switch (i) {
case 'u':
/*
@@ -158,6 +159,9 @@ main(int argc, char **argv)
 */
assign("skipempty", "");
break;
+   case 'a':
+   from = optarg;
+   break;
default:
usage();
/*NOTREACHED*/
@@ -202,6 +206,8 @@ main(int argc, char **argv)
if ((rc = getenv("MAILRC")) == 0)
rc = "~/.mailrc";
load(expand(rc));
+   if (from)
+   assign("from", from);
if (!rcvmode) {
mail(to, cc, bcc, smopts, subject);
/*
@@ -271,7 +277,7 @@ __dead void
 usage(void)
 {
 
-   fprintf(stderr, "usage: %s [-dEIinv] [-b list] [-c list] "
+   fprintf(stderr, "usage: %s [-dEIinv] [-a from] [-b list] [-c list] "
"[-s subject] to-addr ...\n", __progname);
fprintf(stderr, "   %s [-dEIiNnv] -f [file]\n", __progname);
fprintf(stderr, "   %s [-dEIiNnv] [-u user]\n", __progname);
Index: send.c
===
RCS file: /cvs/src/usr.bin/mail/send.c,v
retrieving revision 1.23
diff -u -p -r1.23 send.c
--- send.c  17 Jan 2014 18:42:30 -  1.23
+++ send.c  4 Jan 2015 05:42:08 -
@@ -287,7 +287,11 @@ mail(struct name *to, struct name *cc, s
head.h_subject = subject;
head.h_cc = cc;
head.h_bcc = bcc;
-   head.h_smopts = smopts;
+   if (value("from")) {
+   head.h_smopts = cat(smopts, nalloc("-f", 0));
+   head.h_smopts = cat(head.h_smopts, nalloc(value("from"), 0));
+   } else
+   head.h_smopts = smopts;
mail1(&head, 0);
return(0);
 }
@@ -307,7 +311,11 @@ sendmail(void *v)
head.h_subject = NULL;
head.h_cc = NULL;
head.h_bcc = NULL;
-   head.h_smopts = NULL;
+   if (value("from")) {
+   head.h_smopts = nalloc("-f", 0);
+   head.h_smopts = cat(head.h_smopts, nalloc(value("from"), 0));
+   } else
+   head.h_smopts = NULL;
mail1(&head, 0);
return(0);
 }

ntpd: be more verbose when logging privsep errors

[Brent Cook]

From: Brent Cook 

The idea here is to make it easier for a sysadmin to diagnose a privilege
separation path problem without looking at the source code. Otherwise, privsep
failers are pretty cryptic.

Maybe its better to make fatal() variadic instead?
---
 src/usr.sbin/ntpd/ntp.c | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index f7478b0..c2d1fd2 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/usr.sbin/ntpd/ntp.c
@@ -121,10 +121,15 @@ ntp_main(int pipe_prnt[2], int fd_ctl, struct ntpd_conf 
*nconf,
ntp_dns(pipe_dns, nconf, pw);
close(pipe_dns[1]);
 
-   if (stat(pw->pw_dir, &stb) == -1)
-   fatal("stat");
-   if (stb.st_uid != 0 || (stb.st_mode & (S_IWGRP|S_IWOTH)) != 0)
-   fatalx("bad privsep dir permissions");
+   if (stat(pw->pw_dir, &stb) == -1) {
+   log_warn("privsep dir %s could not be opened", pw->pw_dir);
+   exit(1);
+   }
+   if (stb.st_uid != 0 || (stb.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+   log_warnx("bad privsep dir %s permissions: %o",
+   pw->pw_dir, stb.st_mode);
+   exit(1);
+   }
if (chroot(pw->pw_dir) == -1)
fatal("chroot");
if (chdir("/") == -1)
-- 
1.9.1

ntpd: do not allow privsep user to be a privileged user

[Brent Cook]

From: Brent Cook 

Maybe these two checks are redundant. OpenNTPD-portable lets one configure
the built-in privilege separation username. Thus, you can potentially
configure that user to be root as well.
---
 src/usr.sbin/ntpd/ntp.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index c2d1fd2..86f58b8 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/usr.sbin/ntpd/ntp.c
@@ -147,6 +147,12 @@ ntp_main(int pipe_prnt[2], int fd_ctl, struct ntpd_conf 
*nconf,
conf = nconf;
setup_listeners(se, conf, &listener_cnt);
 
+   if (pw->pw_uid == 0 || pw->pw_gid == 0)
+   fatal("privsep user cannot be root");
+
+   if (pw->pw_uid == geteuid() || pw->pw_gid == getegid())
+   fatal("privsep user cannot be the privileged user");
+
if (setgroups(1, &pw->pw_gid) ||
setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
-- 
1.9.1

Re: disk quotas bug fix [was: quotas grace period "none" right away]

[Boris Goldberg]

Hello Otto,

Friday, January 2, 2015, 4:16:50 PM, you wrote:

OM> On Fri, Jan 02, 2015 at 03:28:46PM -0600, Boris Goldberg wrote:

>>   What about our second patch?

OM> I'd rather stay in line with FreeBSD and document quoaoff/quotaon is
OM> needed for the new grace period to take effect. 

OM> 
https://svnweb.freebsd.org/base/head/usr.sbin/edquota/edquota.8?r1=140442&r2=166496&pathrev=166496


  In my tests just quotaon was sufficient. However, is it safe to run
quotaon on active system? Also - it's a workaround, not a solution.

-- 
Best regards,
 Borismailto:bo...@twopoint.com

mail(1) and chdir command

[Kaspars Bankovskis]

Due to the order in commands table, "c" maps to "copy", not "chdir" as
man page says. "cd" and "ch" work instead. Two alternative fixes: either
man page or the order of commands - leaving for you to decide. IMHO
better to update man page than muscle memory of old time users.

Index: mail.1
===
RCS file: /cvs/src/usr.bin/mail/mail.1,v
retrieving revision 1.70
diff -u -p -r1.70 mail.1
--- mail.1  16 Dec 2014 18:37:17 -  1.70
+++ mail.1  3 Jan 2015 20:49:55 -
@@ -422,12 +422,14 @@ If the
 command is given with no argument, the current set of alternate
 names is displayed.
 .It Ic chdir
-.Pq Ic c
+.Pf ( Ic ch
+or
+.Ic cd )
 Changes the user's working directory to that specified, if given.
 If
 no directory is given, then changes to the user's login directory.
 .It Ic copy
-.Pq Ic co
+.Pq Ic c
 The
 .Ic copy
 command does the same thing that


Alternatively, keeping man page, but moving copy command down:


Index: cmdtab.c
===
RCS file: /cvs/src/usr.bin/mail/cmdtab.c,v
retrieving revision 1.13
diff -u -p -r1.13 cmdtab.c
--- cmdtab.c27 Oct 2009 23:59:40 -  1.13
+++ cmdtab.c3 Jan 2015 20:41:36 -
@@ -69,9 +69,9 @@ const struct cmd cmdtab[] = {
{ "unread", { unread }, MSGLIST,0,  MMNDEL },
{ "Unread", { unread }, MSGLIST,0,  MMNDEL },
{ "!",  { shell },  I|STRLIST,  0,  0 },
-   { "copy",   { copycmd },M|STRLIST,  0,  0 },
{ "chdir",  { schdir }, M|RAWLIST,  0,  1 },
{ "cd", { schdir }, M|RAWLIST,  0,  1 },
+   { "copy",   { copycmd },M|STRLIST,  0,  0 },
{ "save",   { save },   STRLIST,0,  0 },
{ "source", { source }, M|RAWLIST,  1,  1 },
{ "set",{ set },M|RAWLIST,  0,  1000 },

Re: httpd: multiple addresses for one server

[Reyk Floeter]

On Sat, Jan 03, 2015 at 05:19:16PM +0100, Reyk Floeter wrote:
> My tests show that memory usage is not the problem but that there's
> indeed a problem with the pre-opened file descriptors for servers;
> something that is not necessary with aliases. A simple fix will follow.
> 

Here is a fix for the previous: in the parent, only open a socket once
per unique listen statement.  This allows to specify many aliases and
listen statements.

Reyk

Index: config.c
===
RCS file: /cvs/src/usr.sbin/httpd/config.c,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 config.c
--- config.c3 Jan 2015 15:49:18 -   1.27
+++ config.c3 Jan 2015 19:32:00 -
@@ -200,7 +200,9 @@ config_setserver(struct httpd *env, stru
n = -1;
proc_range(ps, id, &n, &m);
for (n = 0; n < m; n++) {
-   if ((fd = dup(srv->srv_s)) == -1)
+   if (srv->srv_s == -1)
+   fd = -1;
+   else if ((fd = dup(srv->srv_s)) == -1)
return (-1);
proc_composev_imsg(ps, id, n,
IMSG_CFG_SERVER, fd, iov, c);
@@ -211,9 +213,6 @@ config_setserver(struct httpd *env, stru
}
}
 
-   close(srv->srv_s);
-   srv->srv_s = -1;
-
return (0);
 }
 
@@ -356,8 +355,12 @@ config_getserver(struct httpd *env, stru
if ((srv = server_byaddr((struct sockaddr *)
&srv_conf.ss, srv_conf.port)) != NULL) {
/* Add "host" to existing listening server */
-   if (imsg->fd != -1)
-   close(imsg->fd);
+   if (imsg->fd != -1) {
+   if (srv->srv_s == -1)
+   srv->srv_s = imsg->fd;
+   else
+   close(imsg->fd);
+   }
return (config_getserver_config(env, srv, imsg));
}
 
Index: parse.y
===
RCS file: /cvs/src/usr.sbin/httpd/parse.y,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 parse.y
--- parse.y 3 Jan 2015 16:20:31 -   1.48
+++ parse.y 3 Jan 2015 19:32:01 -
@@ -226,6 +226,7 @@ server  : SERVER STRING {
strlcpy(s->srv_conf.errorlog, HTTPD_ERROR_LOG,
sizeof(s->srv_conf.errorlog));
s->srv_conf.id = ++last_server_id;
+   s->srv_s = -1;
s->srv_conf.timeout.tv_sec = SERVER_TIMEOUT;
s->srv_conf.maxrequests = SERVER_MAXREQUESTS;
s->srv_conf.maxrequestbody = SERVER_MAXREQUESTBODY;
@@ -493,6 +494,7 @@ serveroptsl : LISTEN ON STRING opttls po
/* A location entry uses the parent id */
s->srv_conf.id = srv->srv_conf.id;
s->srv_conf.flags = SRVFLAG_LOCATION;
+   s->srv_s = -1;
memcpy(&s->srv_conf.ss, &srv->srv_conf.ss,
sizeof(s->srv_conf.ss));
s->srv_conf.port = srv->srv_conf.port;
@@ -1742,6 +1744,8 @@ server_inherit(struct server *src, const
fatal("out of memory");
 
dst->srv_conf.id = ++last_server_id;
+   dst->srv_s = -1;
+
if (last_server_id == INT_MAX) {
yyerror("too many servers defined");
serverconfig_free(&dst->srv_conf);
@@ -1806,6 +1810,7 @@ server_inherit(struct server *src, const
sizeof(dstl->srv_conf.ss));
dstl->srv_conf.port = addr->port;
dstl->srv_conf.prefixlen = addr->prefixlen;
+   dstl->srv_s = -1;
 
DPRINTF("adding location \"%s\" for \"%s[%u]\"",
dstl->srv_conf.location,
Index: server.c
===
RCS file: /cvs/src/usr.sbin/httpd/server.c,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 server.c
--- server.c21 Dec 2014 00:54:49 -  1.49
+++ server.c3 Jan 2015 19:32:01 -
@@ -101,11 +101,27 @@ server_shutdown(void)
 int
 server_privinit(struct server *srv)
 {
+   struct server   *s;
+
if (srv->srv_conf.flags & SRVFLAG_LOCATION)
return (0);
 
log_debug("%s: adding server %s", __func__, srv->srv_conf.name);
 
+   /*
+* There's no need to open a new socket if a server with the
+* same address already exists.
+*/
+   TAILQ_FOREACH(s, env->sc_servers, srv_entry) {
+   if (s != srv && s->srv_s != -1 &&
+   s->srv_conf.port == srv->srv_conf.port &&
+   sockaddr_cmp((struct sockaddr *)&s->srv_c

Patch for mail(1) man page

[trondd]

Just a small patch to document the '=' command.

Tim.

Index: mail.1
===
RCS file: /cvs/src/usr.bin/mail/mail.1,v
retrieving revision 1.70
diff -u -p -r1.70 mail.1
--- mail.1  16 Dec 2014 18:37:17 -  1.70
+++ mail.1  3 Jan 2015 18:42:15 -
@@ -385,6 +385,8 @@ argument
 goes to the
 .Ar n Ns th
 previous message and prints it.
+.It Ic \&=
+Prints the currently selected message number.
 .It Ic \&?
 Prints a brief summary of commands.
 .It Ic \&!

httpd directory listing not properly encoded.

[Remco]

I think that the directory listing generated by httpd doesn't properly encode 
strings that are taken from C-variables. (function "server_file_index" in 
server_file.c)

e.g., filenames with spaces, or odd characters, produce non-functioning links.

I used the following directory structure to test:
mkdir test
echo "TEST" > test/test.txt
echo "Test" > test/.hidden.txt
echo "test ONCE more" > test/"test once more".txt
mkdir test/" \\test\"&\"&"
echo "& test" > test/" \\test\"&\"&"/"".txt

What I see:
- the file test/"test once more".txt cannot be displayed because is has spaces 
in its name. (doesn't appear to be a problem on CURRENT though)
- the directory test/" \\test\"&\"&" cannot be displayed either and 
will also cause subsequent characters to be printed in bold because of the 
 character sequence.
- the filename part of test/" \\test\"& \"&"/"".txt is possibly 
rendered as .txt.

AFAICT tell the C-variables need to be "HTML encoded" or both "URI percent 
encoded" and "HTML encoded" in case of URIs in hrefs.

I spotted the url_decode function but i don't immediately see any encoding 
functions so I'm wondering do encoding functions exist ?

Just in case it's of interrest, I ripped an "URI percent encode" and a "HTML 
encode" function from some hobby project of mine and used it to encode the C-
variables. This appears to solve the issues described. Though I don't know for 
sure my code is anywhere near perfect I can produce a diff if that's 
appreciated.