annotate src/sm-archive.cpp @ 17:8ebecad6530f stable-1-6

Add src/daemon* missing from source control. Switch to Mercurial source control.
author Carl Byington <carl@five-ten-sg.com>
date Fri, 21 Mar 2008 16:00:13 -0700
parents 75e1a9bcbc2e
children b24369330483
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
616666e2f34c initial version
carl
parents:
diff changeset
1 /*
616666e2f34c initial version
carl
parents:
diff changeset
2
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
3 Copyright (c) 2007 Carl Byington - 510 Software Group, released under
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
4 the GPL version 3 or any later version at your choice available at
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
5 http://www.gnu.org/licenses/gpl-3.0.txt
0
616666e2f34c initial version
carl
parents:
diff changeset
6
616666e2f34c initial version
carl
parents:
diff changeset
7 Based on a sample milter Copyright (c) 2000-2003 Sendmail, Inc. and its
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
8 suppliers.
0
616666e2f34c initial version
carl
parents:
diff changeset
9
616666e2f34c initial version
carl
parents:
diff changeset
10 -p port The port through which the MTA will connect to this milter.
616666e2f34c initial version
carl
parents:
diff changeset
11 -t sec The timeout value.
616666e2f34c initial version
carl
parents:
diff changeset
12 -c Check the config, and print a copy to stdout. Don't start the
616666e2f34c initial version
carl
parents:
diff changeset
13 milter or do anything with the socket.
616666e2f34c initial version
carl
parents:
diff changeset
14 -d increase debug level
616666e2f34c initial version
carl
parents:
diff changeset
15
616666e2f34c initial version
carl
parents:
diff changeset
16 */
616666e2f34c initial version
carl
parents:
diff changeset
17
616666e2f34c initial version
carl
parents:
diff changeset
18
616666e2f34c initial version
carl
parents:
diff changeset
19 // from sendmail sample
616666e2f34c initial version
carl
parents:
diff changeset
20 #include <sys/types.h>
616666e2f34c initial version
carl
parents:
diff changeset
21 #include <sys/stat.h>
616666e2f34c initial version
carl
parents:
diff changeset
22 #include <errno.h>
616666e2f34c initial version
carl
parents:
diff changeset
23 #include <sysexits.h>
616666e2f34c initial version
carl
parents:
diff changeset
24 #include <unistd.h>
616666e2f34c initial version
carl
parents:
diff changeset
25
616666e2f34c initial version
carl
parents:
diff changeset
26 // needed for thread
616666e2f34c initial version
carl
parents:
diff changeset
27 #include <pthread.h>
616666e2f34c initial version
carl
parents:
diff changeset
28
616666e2f34c initial version
carl
parents:
diff changeset
29 // needed for std c++ collections
616666e2f34c initial version
carl
parents:
diff changeset
30 #include <set>
616666e2f34c initial version
carl
parents:
diff changeset
31 #include <map>
616666e2f34c initial version
carl
parents:
diff changeset
32 #include <list>
616666e2f34c initial version
carl
parents:
diff changeset
33
616666e2f34c initial version
carl
parents:
diff changeset
34 // misc stuff needed here
616666e2f34c initial version
carl
parents:
diff changeset
35 #include <ctype.h>
616666e2f34c initial version
carl
parents:
diff changeset
36 #include <syslog.h>
616666e2f34c initial version
carl
parents:
diff changeset
37 #include <pwd.h>
616666e2f34c initial version
carl
parents:
diff changeset
38 #include <sys/wait.h> /* header for waitpid() and various macros */
616666e2f34c initial version
carl
parents:
diff changeset
39 #include <signal.h> /* header for signal functions */
616666e2f34c initial version
carl
parents:
diff changeset
40
616666e2f34c initial version
carl
parents:
diff changeset
41 #include "includes.h"
616666e2f34c initial version
carl
parents:
diff changeset
42
9
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
43 #ifndef HAVE_DAEMON
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
44 #include "daemon.h"
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
45 #include "daemon.c"
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
46 #endif
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
47
0
616666e2f34c initial version
carl
parents:
diff changeset
48 extern "C" {
9
48880e61ce5e better autoconf, changes for solaris portability
carl
parents: 8
diff changeset
49 #include <libmilter/mfapi.h>
0
616666e2f34c initial version
carl
parents:
diff changeset
50 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);
616666e2f34c initial version
carl
parents:
diff changeset
51 sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv);
616666e2f34c initial version
carl
parents:
diff changeset
52 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv);
616666e2f34c initial version
carl
parents:
diff changeset
53 sfsistat mlfi_eom(SMFICTX *ctx);
616666e2f34c initial version
carl
parents:
diff changeset
54 sfsistat mlfi_abort(SMFICTX *ctx);
616666e2f34c initial version
carl
parents:
diff changeset
55 sfsistat mlfi_close(SMFICTX *ctx);
616666e2f34c initial version
carl
parents:
diff changeset
56 void sig_chld(int signo);
616666e2f34c initial version
carl
parents:
diff changeset
57 }
616666e2f34c initial version
carl
parents:
diff changeset
58
616666e2f34c initial version
carl
parents:
diff changeset
59 int debug_syslog = 0;
616666e2f34c initial version
carl
parents:
diff changeset
60 bool syslog_opened = false;
616666e2f34c initial version
carl
parents:
diff changeset
61 bool use_syslog = true; // false to printf
616666e2f34c initial version
carl
parents:
diff changeset
62 bool loader_run = true; // used to stop the config loader thread
616666e2f34c initial version
carl
parents:
diff changeset
63 CONFIG *config = NULL; // protected by the config_mutex
616666e2f34c initial version
carl
parents:
diff changeset
64 int generation = 0; // protected by the config_mutex
616666e2f34c initial version
carl
parents:
diff changeset
65 const int maxlen = 1000; // used for snprintf buffers
616666e2f34c initial version
carl
parents:
diff changeset
66
616666e2f34c initial version
carl
parents:
diff changeset
67 pthread_mutex_t config_mutex;
616666e2f34c initial version
carl
parents:
diff changeset
68 pthread_mutex_t syslog_mutex;
616666e2f34c initial version
carl
parents:
diff changeset
69
616666e2f34c initial version
carl
parents:
diff changeset
70
616666e2f34c initial version
carl
parents:
diff changeset
71 mlfiPriv::mlfiPriv() {
616666e2f34c initial version
carl
parents:
diff changeset
72 pthread_mutex_lock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
73 pc = config;
616666e2f34c initial version
carl
parents:
diff changeset
74 pc->reference_count++;
616666e2f34c initial version
carl
parents:
diff changeset
75 pthread_mutex_unlock(&config_mutex);
8
ed73e6361570 initial version
carl
parents: 7
diff changeset
76 mailaddr = NULL;
ed73e6361570 initial version
carl
parents: 7
diff changeset
77 queueid = NULL;
0
616666e2f34c initial version
carl
parents:
diff changeset
78 }
616666e2f34c initial version
carl
parents:
diff changeset
79
616666e2f34c initial version
carl
parents:
diff changeset
80 mlfiPriv::~mlfiPriv() {
616666e2f34c initial version
carl
parents:
diff changeset
81 pthread_mutex_lock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
82 pc->reference_count--;
616666e2f34c initial version
carl
parents:
diff changeset
83 pthread_mutex_unlock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
84 reset(true);
616666e2f34c initial version
carl
parents:
diff changeset
85 }
616666e2f34c initial version
carl
parents:
diff changeset
86
616666e2f34c initial version
carl
parents:
diff changeset
87 void mlfiPriv::reset(bool final) {
8
ed73e6361570 initial version
carl
parents: 7
diff changeset
88 targets.clear();
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
89 for (string_set::iterator i=removal.begin(); i!=removal.end(); i++) {
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
90 char *remove = (*i);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
91 free(remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
92 }
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
93 removal.clear();
0
616666e2f34c initial version
carl
parents:
diff changeset
94 if (mailaddr) free(mailaddr);
616666e2f34c initial version
carl
parents:
diff changeset
95 if (queueid) free(queueid);
616666e2f34c initial version
carl
parents:
diff changeset
96 if (!final) {
616666e2f34c initial version
carl
parents:
diff changeset
97 mailaddr = NULL;
616666e2f34c initial version
carl
parents:
diff changeset
98 queueid = NULL;
616666e2f34c initial version
carl
parents:
diff changeset
99 }
616666e2f34c initial version
carl
parents:
diff changeset
100 }
616666e2f34c initial version
carl
parents:
diff changeset
101
616666e2f34c initial version
carl
parents:
diff changeset
102 #define MLFIPRIV ((struct mlfiPriv *) smfi_getpriv(ctx))
616666e2f34c initial version
carl
parents:
diff changeset
103
616666e2f34c initial version
carl
parents:
diff changeset
104
616666e2f34c initial version
carl
parents:
diff changeset
105 ////////////////////////////////////////////////
616666e2f34c initial version
carl
parents:
diff changeset
106 // syslog a message
616666e2f34c initial version
carl
parents:
diff changeset
107 //
616666e2f34c initial version
carl
parents:
diff changeset
108 void my_syslog(mlfiPriv *priv, char *text) {
616666e2f34c initial version
carl
parents:
diff changeset
109 char buf[maxlen];
616666e2f34c initial version
carl
parents:
diff changeset
110 if (priv) {
616666e2f34c initial version
carl
parents:
diff changeset
111 snprintf(buf, sizeof(buf), "%s: %s", priv->queueid, text);
616666e2f34c initial version
carl
parents:
diff changeset
112 text = buf;
616666e2f34c initial version
carl
parents:
diff changeset
113 }
616666e2f34c initial version
carl
parents:
diff changeset
114 if (use_syslog) {
616666e2f34c initial version
carl
parents:
diff changeset
115 pthread_mutex_lock(&syslog_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
116 if (!syslog_opened) {
2
32b57406b656 initial version
carl
parents: 0
diff changeset
117 openlog("sm-archive", LOG_PID, LOG_MAIL);
0
616666e2f34c initial version
carl
parents:
diff changeset
118 syslog_opened = true;
616666e2f34c initial version
carl
parents:
diff changeset
119 }
616666e2f34c initial version
carl
parents:
diff changeset
120 syslog(LOG_NOTICE, "%s", text);
616666e2f34c initial version
carl
parents:
diff changeset
121 pthread_mutex_unlock(&syslog_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
122 }
616666e2f34c initial version
carl
parents:
diff changeset
123 else {
616666e2f34c initial version
carl
parents:
diff changeset
124 printf("%s \n", text);
616666e2f34c initial version
carl
parents:
diff changeset
125 }
616666e2f34c initial version
carl
parents:
diff changeset
126 }
616666e2f34c initial version
carl
parents:
diff changeset
127
616666e2f34c initial version
carl
parents:
diff changeset
128 void my_syslog(char *text) {
616666e2f34c initial version
carl
parents:
diff changeset
129 my_syslog(NULL, text);
616666e2f34c initial version
carl
parents:
diff changeset
130 }
616666e2f34c initial version
carl
parents:
diff changeset
131
616666e2f34c initial version
carl
parents:
diff changeset
132
616666e2f34c initial version
carl
parents:
diff changeset
133 ////////////////////////////////////////////////
616666e2f34c initial version
carl
parents:
diff changeset
134 // this email address is passed in from sendmail, and will
616666e2f34c initial version
carl
parents:
diff changeset
135 // always be enclosed in <>. It may have mixed case, just
616666e2f34c initial version
carl
parents:
diff changeset
136 // as the mail client sent it. We dup the string and convert
616666e2f34c initial version
carl
parents:
diff changeset
137 // the duplicate to lower case.
616666e2f34c initial version
carl
parents:
diff changeset
138 //
616666e2f34c initial version
carl
parents:
diff changeset
139 char *to_lower_string(char *email);
616666e2f34c initial version
carl
parents:
diff changeset
140 char *to_lower_string(char *email) {
616666e2f34c initial version
carl
parents:
diff changeset
141 int n = strlen(email)-2;
616666e2f34c initial version
carl
parents:
diff changeset
142 if (n < 1) return strdup(email);
616666e2f34c initial version
carl
parents:
diff changeset
143 char *key = strdup(email+1);
616666e2f34c initial version
carl
parents:
diff changeset
144 key[n] = '\0';
616666e2f34c initial version
carl
parents:
diff changeset
145 for (int i=0; i<n; i++) key[i] = tolower(key[i]);
616666e2f34c initial version
carl
parents:
diff changeset
146 return key;
616666e2f34c initial version
carl
parents:
diff changeset
147 }
616666e2f34c initial version
carl
parents:
diff changeset
148
616666e2f34c initial version
carl
parents:
diff changeset
149
616666e2f34c initial version
carl
parents:
diff changeset
150 ////////////////////////////////////////////////
616666e2f34c initial version
carl
parents:
diff changeset
151 // start of sendmail milter interfaces
616666e2f34c initial version
carl
parents:
diff changeset
152 //
616666e2f34c initial version
carl
parents:
diff changeset
153 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
616666e2f34c initial version
carl
parents:
diff changeset
154 {
616666e2f34c initial version
carl
parents:
diff changeset
155 // allocate some private memory
616666e2f34c initial version
carl
parents:
diff changeset
156 mlfiPriv *priv = new mlfiPriv;
616666e2f34c initial version
carl
parents:
diff changeset
157 // save the private data
616666e2f34c initial version
carl
parents:
diff changeset
158 smfi_setpriv(ctx, (void*)priv);
616666e2f34c initial version
carl
parents:
diff changeset
159 // continue processing
616666e2f34c initial version
carl
parents:
diff changeset
160 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
161 }
616666e2f34c initial version
carl
parents:
diff changeset
162
616666e2f34c initial version
carl
parents:
diff changeset
163 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from)
616666e2f34c initial version
carl
parents:
diff changeset
164 {
616666e2f34c initial version
carl
parents:
diff changeset
165 mlfiPriv &priv = *MLFIPRIV;
616666e2f34c initial version
carl
parents:
diff changeset
166 priv.mailaddr = to_lower_string(from[0]);
616666e2f34c initial version
carl
parents:
diff changeset
167 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
168 }
616666e2f34c initial version
carl
parents:
diff changeset
169
8
ed73e6361570 initial version
carl
parents: 7
diff changeset
170 void add_target(mlfiPriv &priv, char *target);
ed73e6361570 initial version
carl
parents: 7
diff changeset
171 void add_target(mlfiPriv &priv, char *target)
7
5241a079fe03 initial version
carl
parents: 3
diff changeset
172 {
5241a079fe03 initial version
carl
parents: 3
diff changeset
173 if (target) {
8
ed73e6361570 initial version
carl
parents: 7
diff changeset
174 string_set::iterator i = priv.targets.find(target);
ed73e6361570 initial version
carl
parents: 7
diff changeset
175 if (i == priv.targets.end()) priv.targets.insert(target);
7
5241a079fe03 initial version
carl
parents: 3
diff changeset
176 }
5241a079fe03 initial version
carl
parents: 3
diff changeset
177 }
5241a079fe03 initial version
carl
parents: 3
diff changeset
178
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
179 void add_remove(mlfiPriv &priv, char *remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
180 void add_remove(mlfiPriv &priv, char *remove)
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
181 {
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
182 if (remove) {
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
183 string_set::iterator i = priv.removal.find(remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
184 if (i == priv.removal.end()) priv.removal.insert(remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
185 }
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
186 }
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
187
0
616666e2f34c initial version
carl
parents:
diff changeset
188 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt)
616666e2f34c initial version
carl
parents:
diff changeset
189 {
616666e2f34c initial version
carl
parents:
diff changeset
190 mlfiPriv &priv = *MLFIPRIV;
616666e2f34c initial version
carl
parents:
diff changeset
191 CONFIG &dc = *priv.pc;
616666e2f34c initial version
carl
parents:
diff changeset
192 if (!priv.queueid) priv.queueid = strdup(smfi_getsymval(ctx, "i"));
616666e2f34c initial version
carl
parents:
diff changeset
193 char *rcptaddr = to_lower_string(rcpt[0]);
616666e2f34c initial version
carl
parents:
diff changeset
194 if (debug_syslog > 1) {
616666e2f34c initial version
carl
parents:
diff changeset
195 char msg[maxlen];
616666e2f34c initial version
carl
parents:
diff changeset
196 snprintf(msg, sizeof(msg), "from <%s> to <%s>", priv.mailaddr, rcptaddr);
616666e2f34c initial version
carl
parents:
diff changeset
197 my_syslog(&priv, msg);
616666e2f34c initial version
carl
parents:
diff changeset
198 }
616666e2f34c initial version
carl
parents:
diff changeset
199 char *target = dc.find_to(rcptaddr);
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
200 add_target(priv, target);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
201 bool remove = dc.find_remove(rcptaddr);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
202 if (remove) add_remove(priv, strdup(rcptaddr));
0
616666e2f34c initial version
carl
parents:
diff changeset
203 free(rcptaddr);
616666e2f34c initial version
carl
parents:
diff changeset
204 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
205 }
616666e2f34c initial version
carl
parents:
diff changeset
206
616666e2f34c initial version
carl
parents:
diff changeset
207 sfsistat mlfi_eom(SMFICTX *ctx)
616666e2f34c initial version
carl
parents:
diff changeset
208 {
8
ed73e6361570 initial version
carl
parents: 7
diff changeset
209 mlfiPriv &priv = *MLFIPRIV;
ed73e6361570 initial version
carl
parents: 7
diff changeset
210 CONFIG &dc = *priv.pc;
ed73e6361570 initial version
carl
parents: 7
diff changeset
211 char *target = dc.find_from(priv.mailaddr);
ed73e6361570 initial version
carl
parents: 7
diff changeset
212 add_target(priv, target);
ed73e6361570 initial version
carl
parents: 7
diff changeset
213 for (string_set::iterator i=priv.targets.begin(); i!=priv.targets.end(); i++) {
ed73e6361570 initial version
carl
parents: 7
diff changeset
214 target = (*i);
ed73e6361570 initial version
carl
parents: 7
diff changeset
215 smfi_addrcpt(ctx, target);
ed73e6361570 initial version
carl
parents: 7
diff changeset
216 if (debug_syslog > 1) {
ed73e6361570 initial version
carl
parents: 7
diff changeset
217 char msg[maxlen];
ed73e6361570 initial version
carl
parents: 7
diff changeset
218 snprintf(msg, sizeof(msg), "adding recipient <%s>", target);
ed73e6361570 initial version
carl
parents: 7
diff changeset
219 my_syslog(&priv, msg);
ed73e6361570 initial version
carl
parents: 7
diff changeset
220 }
ed73e6361570 initial version
carl
parents: 7
diff changeset
221 }
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
222 for (string_set::iterator i=priv.removal.begin(); i!=priv.removal.end(); i++) {
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
223 char *remove = (*i);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
224 smfi_delrcpt(ctx, remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
225 if (debug_syslog > 1) {
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
226 char msg[maxlen];
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
227 snprintf(msg, sizeof(msg), "removing recipient <%s>", remove);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
228 my_syslog(&priv, msg);
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
229 }
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
230 }
0
616666e2f34c initial version
carl
parents:
diff changeset
231 // reset for a new message on the same connection
616666e2f34c initial version
carl
parents:
diff changeset
232 mlfi_abort(ctx);
616666e2f34c initial version
carl
parents:
diff changeset
233 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
234 }
616666e2f34c initial version
carl
parents:
diff changeset
235
616666e2f34c initial version
carl
parents:
diff changeset
236 sfsistat mlfi_abort(SMFICTX *ctx)
616666e2f34c initial version
carl
parents:
diff changeset
237 {
616666e2f34c initial version
carl
parents:
diff changeset
238 mlfiPriv &priv = *MLFIPRIV;
616666e2f34c initial version
carl
parents:
diff changeset
239 priv.reset();
616666e2f34c initial version
carl
parents:
diff changeset
240 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
241 }
616666e2f34c initial version
carl
parents:
diff changeset
242
616666e2f34c initial version
carl
parents:
diff changeset
243 sfsistat mlfi_close(SMFICTX *ctx)
616666e2f34c initial version
carl
parents:
diff changeset
244 {
616666e2f34c initial version
carl
parents:
diff changeset
245 mlfiPriv *priv = MLFIPRIV;
616666e2f34c initial version
carl
parents:
diff changeset
246 if (!priv) return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
247 delete priv;
616666e2f34c initial version
carl
parents:
diff changeset
248 smfi_setpriv(ctx, NULL);
616666e2f34c initial version
carl
parents:
diff changeset
249 return SMFIS_CONTINUE;
616666e2f34c initial version
carl
parents:
diff changeset
250 }
616666e2f34c initial version
carl
parents:
diff changeset
251
616666e2f34c initial version
carl
parents:
diff changeset
252 struct smfiDesc smfilter =
616666e2f34c initial version
carl
parents:
diff changeset
253 {
616666e2f34c initial version
carl
parents:
diff changeset
254 "SM-ARCHIVE", // filter name
616666e2f34c initial version
carl
parents:
diff changeset
255 SMFI_VERSION, // version code -- do not change
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
256 SMFIF_ADDRCPT | \
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
257 SMFIF_DELRCPT, // flags
0
616666e2f34c initial version
carl
parents:
diff changeset
258 mlfi_connect, // connection info filter
616666e2f34c initial version
carl
parents:
diff changeset
259 NULL, // SMTP HELO command filter
616666e2f34c initial version
carl
parents:
diff changeset
260 mlfi_envfrom, // envelope sender filter
616666e2f34c initial version
carl
parents:
diff changeset
261 mlfi_envrcpt, // envelope recipient filter
616666e2f34c initial version
carl
parents:
diff changeset
262 NULL, // header filter
616666e2f34c initial version
carl
parents:
diff changeset
263 NULL, // end of header
616666e2f34c initial version
carl
parents:
diff changeset
264 NULL, // body block filter
616666e2f34c initial version
carl
parents:
diff changeset
265 mlfi_eom, // end of message
616666e2f34c initial version
carl
parents:
diff changeset
266 mlfi_abort, // message aborted
616666e2f34c initial version
carl
parents:
diff changeset
267 mlfi_close, // connection cleanup
616666e2f34c initial version
carl
parents:
diff changeset
268 };
616666e2f34c initial version
carl
parents:
diff changeset
269
616666e2f34c initial version
carl
parents:
diff changeset
270
616666e2f34c initial version
carl
parents:
diff changeset
271 ////////////////////////////////////////////////
616666e2f34c initial version
carl
parents:
diff changeset
272 // reload the config
616666e2f34c initial version
carl
parents:
diff changeset
273 //
616666e2f34c initial version
carl
parents:
diff changeset
274 CONFIG* new_conf();
616666e2f34c initial version
carl
parents:
diff changeset
275 CONFIG* new_conf() {
616666e2f34c initial version
carl
parents:
diff changeset
276 CONFIG *newc = new CONFIG;
616666e2f34c initial version
carl
parents:
diff changeset
277 pthread_mutex_lock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
278 newc->generation = generation++;
616666e2f34c initial version
carl
parents:
diff changeset
279 pthread_mutex_unlock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
280 if (debug_syslog) {
616666e2f34c initial version
carl
parents:
diff changeset
281 char buf[maxlen];
616666e2f34c initial version
carl
parents:
diff changeset
282 snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation);
616666e2f34c initial version
carl
parents:
diff changeset
283 my_syslog(buf);
616666e2f34c initial version
carl
parents:
diff changeset
284 }
2
32b57406b656 initial version
carl
parents: 0
diff changeset
285 if (load_conf(*newc, "sm-archive.conf")) {
0
616666e2f34c initial version
carl
parents:
diff changeset
286 newc->load_time = time(NULL);
616666e2f34c initial version
carl
parents:
diff changeset
287 return newc;
616666e2f34c initial version
carl
parents:
diff changeset
288 }
616666e2f34c initial version
carl
parents:
diff changeset
289 delete newc;
616666e2f34c initial version
carl
parents:
diff changeset
290 return NULL;
616666e2f34c initial version
carl
parents:
diff changeset
291 }
616666e2f34c initial version
carl
parents:
diff changeset
292
616666e2f34c initial version
carl
parents:
diff changeset
293
616666e2f34c initial version
carl
parents:
diff changeset
294 ////////////////////////////////////////////////
616666e2f34c initial version
carl
parents:
diff changeset
295 // thread to watch the old config files for changes
616666e2f34c initial version
carl
parents:
diff changeset
296 // and reload when needed. we also cleanup old
616666e2f34c initial version
carl
parents:
diff changeset
297 // configs whose reference count has gone to zero.
616666e2f34c initial version
carl
parents:
diff changeset
298 //
10
f9e8bbf33a2a more fixes for solaris
carl
parents: 9
diff changeset
299 extern "C" {void* config_loader(void *arg);}
0
616666e2f34c initial version
carl
parents:
diff changeset
300 void* config_loader(void *arg) {
616666e2f34c initial version
carl
parents:
diff changeset
301 while (loader_run) {
616666e2f34c initial version
carl
parents:
diff changeset
302 sleep(180); // look for modifications every 3 minutes
616666e2f34c initial version
carl
parents:
diff changeset
303 if (!loader_run) break;
616666e2f34c initial version
carl
parents:
diff changeset
304 CONFIG &dc = *config;
616666e2f34c initial version
carl
parents:
diff changeset
305 time_t then = dc.load_time;
616666e2f34c initial version
carl
parents:
diff changeset
306 struct stat st;
616666e2f34c initial version
carl
parents:
diff changeset
307 bool reload = false;
616666e2f34c initial version
carl
parents:
diff changeset
308 for (string_set::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
616666e2f34c initial version
carl
parents:
diff changeset
309 char *fn = *i;
616666e2f34c initial version
carl
parents:
diff changeset
310 if (stat(fn, &st)) reload = true; // file disappeared
616666e2f34c initial version
carl
parents:
diff changeset
311 else if (st.st_mtime > then) reload = true; // file modified
616666e2f34c initial version
carl
parents:
diff changeset
312 if (reload) break;
616666e2f34c initial version
carl
parents:
diff changeset
313 }
616666e2f34c initial version
carl
parents:
diff changeset
314 if (reload) {
616666e2f34c initial version
carl
parents:
diff changeset
315 CONFIG *newc = new_conf();
616666e2f34c initial version
carl
parents:
diff changeset
316 if (newc) {
616666e2f34c initial version
carl
parents:
diff changeset
317 // replace the global config pointer
616666e2f34c initial version
carl
parents:
diff changeset
318 pthread_mutex_lock(&config_mutex);
616666e2f34c initial version
carl
parents:
diff changeset
319 CONFIG *old = config;
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
320 bool last = old && (!old->reference_count);
0
616666e2f34c initial version
carl
parents:
diff changeset
321 config = newc;
616666e2f34c initial version
carl
parents:
diff changeset
322 pthread_mutex_unlock(&config_mutex);
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
323 if (last) delete old; // there were no references to this config
0
616666e2f34c initial version
carl
parents:
diff changeset
324 }
616666e2f34c initial version
carl
parents:
diff changeset
325 else {
616666e2f34c initial version
carl
parents:
diff changeset
326 // failed to load new config
616666e2f34c initial version
carl
parents:
diff changeset
327 my_syslog("failed to load new configuration");
2
32b57406b656 initial version
carl
parents: 0
diff changeset
328 system("echo 'failed to load new sm-archive configuration from /etc/sm-archive' | mail -s 'error in /etc/sm-archive configuration' root");
0
616666e2f34c initial version
carl
parents:
diff changeset
329 // update the load time on the current config to prevent complaining every 3 minutes
616666e2f34c initial version
carl
parents:
diff changeset
330 dc.load_time = time(NULL);
616666e2f34c initial version
carl
parents:
diff changeset
331 }
616666e2f34c initial version
carl
parents:
diff changeset
332 }
616666e2f34c initial version
carl
parents:
diff changeset
333 }
616666e2f34c initial version
carl
parents:
diff changeset
334 return NULL;
616666e2f34c initial version
carl
parents:
diff changeset
335 }
616666e2f34c initial version
carl
parents:
diff changeset
336
616666e2f34c initial version
carl
parents:
diff changeset
337
616666e2f34c initial version
carl
parents:
diff changeset
338 void usage(char *prog);
616666e2f34c initial version
carl
parents:
diff changeset
339 void usage(char *prog)
616666e2f34c initial version
carl
parents:
diff changeset
340 {
616666e2f34c initial version
carl
parents:
diff changeset
341 fprintf(stderr, "Usage: %s [-d [level]] [-c] -p sm-sock-addr [-t timeout]\n", prog);
616666e2f34c initial version
carl
parents:
diff changeset
342 fprintf(stderr, "where sm-sock-addr is for the connection to sendmail\n");
616666e2f34c initial version
carl
parents:
diff changeset
343 fprintf(stderr, " and should be one of\n");
616666e2f34c initial version
carl
parents:
diff changeset
344 fprintf(stderr, " inet:port@ip-address\n");
616666e2f34c initial version
carl
parents:
diff changeset
345 fprintf(stderr, " local:local-domain-socket-file-name\n");
616666e2f34c initial version
carl
parents:
diff changeset
346 fprintf(stderr, "-c will load and dump the config to stdout\n");
616666e2f34c initial version
carl
parents:
diff changeset
347 fprintf(stderr, "-d will set the syslog message level, currently 0 to 3\n");
616666e2f34c initial version
carl
parents:
diff changeset
348 }
616666e2f34c initial version
carl
parents:
diff changeset
349
616666e2f34c initial version
carl
parents:
diff changeset
350
616666e2f34c initial version
carl
parents:
diff changeset
351
616666e2f34c initial version
carl
parents:
diff changeset
352 void setup_socket(char *sock);
616666e2f34c initial version
carl
parents:
diff changeset
353 void setup_socket(char *sock) {
616666e2f34c initial version
carl
parents:
diff changeset
354 unlink(sock);
616666e2f34c initial version
carl
parents:
diff changeset
355 // sockaddr_un addr;
616666e2f34c initial version
carl
parents:
diff changeset
356 // memset(&addr, '\0', sizeof addr);
616666e2f34c initial version
carl
parents:
diff changeset
357 // addr.sun_family = AF_UNIX;
616666e2f34c initial version
carl
parents:
diff changeset
358 // strncpy(addr.sun_path, sock, sizeof(addr.sun_path)-1);
616666e2f34c initial version
carl
parents:
diff changeset
359 // int s = socket(AF_UNIX, SOCK_STREAM, 0);
616666e2f34c initial version
carl
parents:
diff changeset
360 // bind(s, (sockaddr*)&addr, sizeof(addr));
616666e2f34c initial version
carl
parents:
diff changeset
361 // close(s);
616666e2f34c initial version
carl
parents:
diff changeset
362 }
616666e2f34c initial version
carl
parents:
diff changeset
363
616666e2f34c initial version
carl
parents:
diff changeset
364
616666e2f34c initial version
carl
parents:
diff changeset
365 /*
616666e2f34c initial version
carl
parents:
diff changeset
366 * The signal handler function -- only gets called when a SIGCHLD
616666e2f34c initial version
carl
parents:
diff changeset
367 * is received, ie when a child terminates
616666e2f34c initial version
carl
parents:
diff changeset
368 */
616666e2f34c initial version
carl
parents:
diff changeset
369 void sig_chld(int signo)
616666e2f34c initial version
carl
parents:
diff changeset
370 {
616666e2f34c initial version
carl
parents:
diff changeset
371 int status;
616666e2f34c initial version
carl
parents:
diff changeset
372 /* Wait for any child without blocking */
616666e2f34c initial version
carl
parents:
diff changeset
373 while (waitpid(-1, &status, WNOHANG) > 0) {
616666e2f34c initial version
carl
parents:
diff changeset
374 // ignore child exit status, we only do this to cleanup zombies
616666e2f34c initial version
carl
parents:
diff changeset
375 }
616666e2f34c initial version
carl
parents:
diff changeset
376 }
616666e2f34c initial version
carl
parents:
diff changeset
377
616666e2f34c initial version
carl
parents:
diff changeset
378
616666e2f34c initial version
carl
parents:
diff changeset
379 int main(int argc, char**argv)
616666e2f34c initial version
carl
parents:
diff changeset
380 {
616666e2f34c initial version
carl
parents:
diff changeset
381 token_init();
616666e2f34c initial version
carl
parents:
diff changeset
382 bool check = false;
616666e2f34c initial version
carl
parents:
diff changeset
383 bool setconn = false;
616666e2f34c initial version
carl
parents:
diff changeset
384 int c;
616666e2f34c initial version
carl
parents:
diff changeset
385 const char *args = "p:t:d:ch";
616666e2f34c initial version
carl
parents:
diff changeset
386 extern char *optarg;
616666e2f34c initial version
carl
parents:
diff changeset
387
616666e2f34c initial version
carl
parents:
diff changeset
388 // Process command line options
616666e2f34c initial version
carl
parents:
diff changeset
389 while ((c = getopt(argc, argv, args)) != -1) {
616666e2f34c initial version
carl
parents:
diff changeset
390 switch (c) {
616666e2f34c initial version
carl
parents:
diff changeset
391 case 'p':
616666e2f34c initial version
carl
parents:
diff changeset
392 if (optarg == NULL || *optarg == '\0') {
616666e2f34c initial version
carl
parents:
diff changeset
393 fprintf(stderr, "Illegal sendmail socket: %s\n", optarg);
616666e2f34c initial version
carl
parents:
diff changeset
394 exit(EX_USAGE);
616666e2f34c initial version
carl
parents:
diff changeset
395 }
616666e2f34c initial version
carl
parents:
diff changeset
396 if (smfi_setconn(optarg) == MI_FAILURE) {
616666e2f34c initial version
carl
parents:
diff changeset
397 fprintf(stderr, "smfi_setconn failed\n");
616666e2f34c initial version
carl
parents:
diff changeset
398 exit(EX_SOFTWARE);
616666e2f34c initial version
carl
parents:
diff changeset
399 }
616666e2f34c initial version
carl
parents:
diff changeset
400 if (strncasecmp(optarg, "unix:", 5) == 0) setup_socket(optarg + 5);
616666e2f34c initial version
carl
parents:
diff changeset
401 else if (strncasecmp(optarg, "local:", 6) == 0) setup_socket(optarg + 6);
616666e2f34c initial version
carl
parents:
diff changeset
402 setconn = true;
616666e2f34c initial version
carl
parents:
diff changeset
403 break;
616666e2f34c initial version
carl
parents:
diff changeset
404
616666e2f34c initial version
carl
parents:
diff changeset
405 case 't':
616666e2f34c initial version
carl
parents:
diff changeset
406 if (optarg == NULL || *optarg == '\0') {
616666e2f34c initial version
carl
parents:
diff changeset
407 fprintf(stderr, "Illegal timeout: %s\n", optarg);
616666e2f34c initial version
carl
parents:
diff changeset
408 exit(EX_USAGE);
616666e2f34c initial version
carl
parents:
diff changeset
409 }
616666e2f34c initial version
carl
parents:
diff changeset
410 if (smfi_settimeout(atoi(optarg)) == MI_FAILURE) {
616666e2f34c initial version
carl
parents:
diff changeset
411 fprintf(stderr, "smfi_settimeout failed\n");
616666e2f34c initial version
carl
parents:
diff changeset
412 exit(EX_SOFTWARE);
616666e2f34c initial version
carl
parents:
diff changeset
413 }
616666e2f34c initial version
carl
parents:
diff changeset
414 break;
616666e2f34c initial version
carl
parents:
diff changeset
415
616666e2f34c initial version
carl
parents:
diff changeset
416 case 'c':
616666e2f34c initial version
carl
parents:
diff changeset
417 check = true;
616666e2f34c initial version
carl
parents:
diff changeset
418 break;
616666e2f34c initial version
carl
parents:
diff changeset
419
616666e2f34c initial version
carl
parents:
diff changeset
420 case 'd':
616666e2f34c initial version
carl
parents:
diff changeset
421 if (optarg == NULL || *optarg == '\0') debug_syslog = 1;
616666e2f34c initial version
carl
parents:
diff changeset
422 else debug_syslog = atoi(optarg);
616666e2f34c initial version
carl
parents:
diff changeset
423 break;
616666e2f34c initial version
carl
parents:
diff changeset
424
616666e2f34c initial version
carl
parents:
diff changeset
425 case 'h':
616666e2f34c initial version
carl
parents:
diff changeset
426 default:
616666e2f34c initial version
carl
parents:
diff changeset
427 usage(argv[0]);
616666e2f34c initial version
carl
parents:
diff changeset
428 exit(EX_USAGE);
616666e2f34c initial version
carl
parents:
diff changeset
429 }
616666e2f34c initial version
carl
parents:
diff changeset
430 }
616666e2f34c initial version
carl
parents:
diff changeset
431
616666e2f34c initial version
carl
parents:
diff changeset
432 if (check) {
616666e2f34c initial version
carl
parents:
diff changeset
433 use_syslog = false;
616666e2f34c initial version
carl
parents:
diff changeset
434 debug_syslog = 10;
616666e2f34c initial version
carl
parents:
diff changeset
435 CONFIG *conf = new_conf();
616666e2f34c initial version
carl
parents:
diff changeset
436 if (conf) {
616666e2f34c initial version
carl
parents:
diff changeset
437 conf->dump();
616666e2f34c initial version
carl
parents:
diff changeset
438 delete conf;
13
75e1a9bcbc2e gpl3, add removal option for original recipients
carl
parents: 10
diff changeset
439 clear_strings(); // for valgrind checking
0
616666e2f34c initial version
carl
parents:
diff changeset
440 return 0;
616666e2f34c initial version
carl
parents:
diff changeset
441 }
616666e2f34c initial version
carl
parents:
diff changeset
442 else {
616666e2f34c initial version
carl
parents:
diff changeset
443 return 1; // config failed to load
616666e2f34c initial version
carl
parents:
diff changeset
444 }
616666e2f34c initial version
carl
parents:
diff changeset
445 }
616666e2f34c initial version
carl
parents:
diff changeset
446
616666e2f34c initial version
carl
parents:
diff changeset
447 if (!setconn) {
616666e2f34c initial version
carl
parents:
diff changeset
448 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
616666e2f34c initial version
carl
parents:
diff changeset
449 usage(argv[0]);
616666e2f34c initial version
carl
parents:
diff changeset
450 exit(EX_USAGE);
616666e2f34c initial version
carl
parents:
diff changeset
451 }
616666e2f34c initial version
carl
parents:
diff changeset
452
616666e2f34c initial version
carl
parents:
diff changeset
453 if (smfi_register(smfilter) == MI_FAILURE) {
616666e2f34c initial version
carl
parents:
diff changeset
454 fprintf(stderr, "smfi_register failed\n");
616666e2f34c initial version
carl
parents:
diff changeset
455 exit(EX_UNAVAILABLE);
616666e2f34c initial version
carl
parents:
diff changeset
456 }
616666e2f34c initial version
carl
parents:
diff changeset
457
616666e2f34c initial version
carl
parents:
diff changeset
458 // switch to background mode
616666e2f34c initial version
carl
parents:
diff changeset
459 if (daemon(1,0) < 0) {
616666e2f34c initial version
carl
parents:
diff changeset
460 fprintf(stderr, "daemon() call failed\n");
616666e2f34c initial version
carl
parents:
diff changeset
461 exit(EX_UNAVAILABLE);
616666e2f34c initial version
carl
parents:
diff changeset
462 }
616666e2f34c initial version
carl
parents:
diff changeset
463
616666e2f34c initial version
carl
parents:
diff changeset
464 // write the pid
2
32b57406b656 initial version
carl
parents: 0
diff changeset
465 const char *pidpath = "/var/run/sm-archive.pid";
0
616666e2f34c initial version
carl
parents:
diff changeset
466 unlink(pidpath);
616666e2f34c initial version
carl
parents:
diff changeset
467 FILE *f = fopen(pidpath, "w");
616666e2f34c initial version
carl
parents:
diff changeset
468 if (f) {
616666e2f34c initial version
carl
parents:
diff changeset
469 #ifdef linux
616666e2f34c initial version
carl
parents:
diff changeset
470 // from a comment in the DCC source code:
616666e2f34c initial version
carl
parents:
diff changeset
471 // Linux threads are broken. Signals given the
616666e2f34c initial version
carl
parents:
diff changeset
472 // original process are delivered to only the
616666e2f34c initial version
carl
parents:
diff changeset
473 // thread that happens to have that PID. The
616666e2f34c initial version
carl
parents:
diff changeset
474 // sendmail libmilter thread that needs to hear
616666e2f34c initial version
carl
parents:
diff changeset
475 // SIGINT and other signals does not, and that breaks
616666e2f34c initial version
carl
parents:
diff changeset
476 // scripts that need to stop milters.
616666e2f34c initial version
carl
parents:
diff changeset
477 // However, signaling the process group works.
616666e2f34c initial version
carl
parents:
diff changeset
478 fprintf(f, "-%d\n", (u_int)getpgrp());
616666e2f34c initial version
carl
parents:
diff changeset
479 #else
616666e2f34c initial version
carl
parents:
diff changeset
480 fprintf(f, "%d\n", (u_int)getpid());
616666e2f34c initial version
carl
parents:
diff changeset
481 #endif
616666e2f34c initial version
carl
parents:
diff changeset
482 fclose(f);
616666e2f34c initial version
carl
parents:
diff changeset
483 }
616666e2f34c initial version
carl
parents:
diff changeset
484
616666e2f34c initial version
carl
parents:
diff changeset
485 // initialize the thread sync objects
616666e2f34c initial version
carl
parents:
diff changeset
486 pthread_mutex_init(&config_mutex, 0);
616666e2f34c initial version
carl
parents:
diff changeset
487 pthread_mutex_init(&syslog_mutex, 0);
616666e2f34c initial version
carl
parents:
diff changeset
488
616666e2f34c initial version
carl
parents:
diff changeset
489 // drop root privs
616666e2f34c initial version
carl
parents:
diff changeset
490 struct passwd *pw = getpwnam("sm-archive");
616666e2f34c initial version
carl
parents:
diff changeset
491 if (pw) {
616666e2f34c initial version
carl
parents:
diff changeset
492 if (setgid(pw->pw_gid) == -1) {
2
32b57406b656 initial version
carl
parents: 0
diff changeset
493 my_syslog("failed to switch to group sm-archive");
0
616666e2f34c initial version
carl
parents:
diff changeset
494 }
616666e2f34c initial version
carl
parents:
diff changeset
495 if (setuid(pw->pw_uid) == -1) {
2
32b57406b656 initial version
carl
parents: 0
diff changeset
496 my_syslog("failed to switch to user sm-archive");
0
616666e2f34c initial version
carl
parents:
diff changeset
497 }
616666e2f34c initial version
carl
parents:
diff changeset
498 }
616666e2f34c initial version
carl
parents:
diff changeset
499
616666e2f34c initial version
carl
parents:
diff changeset
500 // load the initial config
616666e2f34c initial version
carl
parents:
diff changeset
501 config = new_conf();
616666e2f34c initial version
carl
parents:
diff changeset
502 if (!config) {
616666e2f34c initial version
carl
parents:
diff changeset
503 my_syslog("failed to load initial configuration, quitting");
616666e2f34c initial version
carl
parents:
diff changeset
504 exit(1);
616666e2f34c initial version
carl
parents:
diff changeset
505 }
616666e2f34c initial version
carl
parents:
diff changeset
506
616666e2f34c initial version
carl
parents:
diff changeset
507 // only create threads after the fork() in daemon
616666e2f34c initial version
carl
parents:
diff changeset
508 pthread_t tid;
616666e2f34c initial version
carl
parents:
diff changeset
509 if (pthread_create(&tid, 0, config_loader, 0))
616666e2f34c initial version
carl
parents:
diff changeset
510 my_syslog("failed to create config loader thread");
616666e2f34c initial version
carl
parents:
diff changeset
511 if (pthread_detach(tid))
616666e2f34c initial version
carl
parents:
diff changeset
512 my_syslog("failed to detach config loader thread");
616666e2f34c initial version
carl
parents:
diff changeset
513
616666e2f34c initial version
carl
parents:
diff changeset
514 time_t starting = time(NULL);
616666e2f34c initial version
carl
parents:
diff changeset
515 int rc = smfi_main();
616666e2f34c initial version
carl
parents:
diff changeset
516 if ((rc != MI_SUCCESS) && (time(NULL) > starting+5*60)) {
616666e2f34c initial version
carl
parents:
diff changeset
517 my_syslog("trying to restart after smfi_main()");
616666e2f34c initial version
carl
parents:
diff changeset
518 loader_run = false; // eventually the config loader thread will terminate
616666e2f34c initial version
carl
parents:
diff changeset
519 execvp(argv[0], argv);
616666e2f34c initial version
carl
parents:
diff changeset
520 }
616666e2f34c initial version
carl
parents:
diff changeset
521 exit((rc == MI_SUCCESS) ? 0 : EX_UNAVAILABLE);
616666e2f34c initial version
carl
parents:
diff changeset
522 }
616666e2f34c initial version
carl
parents:
diff changeset
523