Really fix MAILTO hole by parsing spaces.
Remove local bitstring copy
This commit is contained in:
parent
dcaaf7cf51
commit
7ed12e2a4a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=7809
@ -2,7 +2,6 @@ BINDIR?= /usr/sbin
|
||||
|
||||
PROG= cron
|
||||
SRCS= cron.c database.c do_command.c job.c user.c popen.c
|
||||
MAN3= bitstring.3
|
||||
MAN8= cron.8
|
||||
|
||||
.if exists(${.CURDIR}/../lib/obj)
|
||||
|
@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if !defined(lint) && !defined(LINT)
|
||||
static char rcsid[] = "$Id: do_command.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $";
|
||||
static char rcsid[] = "$Id: do_command.c,v 1.2 1995/04/12 18:57:37 ache Exp $";
|
||||
#endif
|
||||
|
||||
|
||||
@ -94,9 +94,34 @@ child_process(e, u)
|
||||
*/
|
||||
usernm = env_get("LOGNAME", e->envp);
|
||||
mailto = env_get("MAILTO", e->envp);
|
||||
if (mailto && *mailto == '-') {
|
||||
log_it("CRON",getpid(), usernm, "attempts to crack");
|
||||
exit(ERROR_EXIT);
|
||||
if (mailto != NULL && *mailto) {
|
||||
char *head, *next;
|
||||
int address_found = 0;
|
||||
|
||||
head = mailto;
|
||||
while (isspace(*head))
|
||||
head++;
|
||||
for ( ; (next = strpbrk(head, " \t")) != NULL; head = next) {
|
||||
next++;
|
||||
while (isspace(*next))
|
||||
next++;
|
||||
address_found = 1;
|
||||
if (*head == '-') {
|
||||
mailto = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (mailto != NULL && *head) {
|
||||
address_found = 1;
|
||||
if (*head == '-')
|
||||
mailto = NULL;
|
||||
}
|
||||
if (!address_found)
|
||||
mailto = "";
|
||||
if (mailto == NULL) {
|
||||
log_it("CRON",getpid(), usernm, "attempts to crack");
|
||||
exit(ERROR_EXIT);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_SIGCHLD
|
||||
|
Loading…
Reference in New Issue
Block a user