projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1) With SETGID_MAIL enabled (only with dot locking), if the chgrp of
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
f0c84f5
..
d866ebc
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-16,16
+16,10
@@
#include <h/tws.h>
#include <h/utils.h>
#include <h/tws.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+#include <time.h>
int debugsw = 0; /* global */
int forwsw = 1;
int debugsw = 0; /* global */
int forwsw = 1;
@@
-198,6
+192,7
@@
attach(char *attachment_header_field_name, char *draft_file_name,
int has_body; /* draft has a message body */
int length; /* length of attachment header field name */
char *p; /* miscellaneous string pointer */
int has_body; /* draft has a message body */
int length; /* length of attachment header field name */
char *p; /* miscellaneous string pointer */
+ FILE *fp; /* pointer for mhn.defaults */
/*
* Open up the draft file.
/*
* Open up the draft file.
@@
-307,6
+302,11
@@
attach(char *attachment_header_field_name, char *draft_file_name,
* that specify attachments. Add a mhbuild MIME composition file for each.
*/
* that specify attachments. Add a mhbuild MIME composition file for each.
*/
+ if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
+ readconfig ((struct node **) NULL, fp, p, 0);
+ fclose(fp);
+ }
+
rewind(draft_file);
while (get_line() != EOF && *field != '\0' && *field != '-') {
rewind(draft_file);
while (get_line() != EOF && *field != '\0' && *field != '-') {
@@
-675,7
+675,7
@@
splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
time (&clock);
snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
time (&clock);
snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
- (int) getpid(), (long) clock, LocalName());
+ (int) getpid(), (long) clock, LocalName(1));
fseek (in, start, SEEK_SET);
for (partno = 1; partno <= nparts; partno++) {
fseek (in, start, SEEK_SET);
for (partno = 1; partno <= nparts; partno++) {