| main.c (168515) | main.c (173340) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set --- 12 unchanged lines hidden (view full) --- 21SM_UNUSED(static char copyright[]) = 22"@(#) Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.\n\ 23 All rights reserved.\n\ 24 Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.\n\ 25 Copyright (c) 1988, 1993\n\ 26 The Regents of the University of California. All rights reserved.\n"; 27#endif /* ! lint */ 28 | 1/* 2 * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set --- 12 unchanged lines hidden (view full) --- 21SM_UNUSED(static char copyright[]) = 22"@(#) Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.\n\ 23 All rights reserved.\n\ 24 Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.\n\ 25 Copyright (c) 1988, 1993\n\ 26 The Regents of the University of California. All rights reserved.\n"; 27#endif /* ! lint */ 28 |
| 29SM_RCSID("@(#)$Id: main.c,v 8.962 2006/12/19 19:47:37 ca Exp $") | 29SM_RCSID("@(#)$Id: main.c,v 8.963 2007/06/29 20:07:37 ca Exp $") |
| 30 31 32#if NETINET || NETINET6 33# include <arpa/inet.h> 34#endif /* NETINET || NETINET6 */ 35 36/* for getcfname() */ 37#include <sendmail/pathnames.h> --- 2319 unchanged lines hidden (view full) --- 2357 2358 /* workaround: can't seem to release the signal in the parent */ 2359 (void) sm_signal(SIGHUP, sighup); 2360 (void) sm_releasesignal(SIGHUP); 2361 (void) sm_signal(SIGTERM, sigterm); 2362 2363 if (QueueIntvl > 0) 2364 { | 30 31 32#if NETINET || NETINET6 33# include <arpa/inet.h> 34#endif /* NETINET || NETINET6 */ 35 36/* for getcfname() */ 37#include <sendmail/pathnames.h> --- 2319 unchanged lines hidden (view full) --- 2357 2358 /* workaround: can't seem to release the signal in the parent */ 2359 (void) sm_signal(SIGHUP, sighup); 2360 (void) sm_releasesignal(SIGHUP); 2361 (void) sm_signal(SIGTERM, sigterm); 2362 2363 if (QueueIntvl > 0) 2364 { |
| 2365 (void) runqueue(true, false, queuepersistent, true); | 2365#if _FFR_RUNPQG 2366 if (qgrp != NOQGRP) 2367 { 2368 int rwgflags = RWG_NONE; |
| 2366 | 2369 |
| 2370 /* 2371 ** To run a specific queue group mark it to 2372 ** be run, select the work group it's in and 2373 ** increment the work counter. 2374 */ 2375 2376 for (i = 0; i < NumQueue && Queue[i] != NULL; 2377 i++) 2378 Queue[i]->qg_nextrun = (time_t) -1; 2379 Queue[qgrp]->qg_nextrun = 0; 2380 if (Verbose) 2381 rwgflags |= RWG_VERBOSE; 2382 if (queuepersistent) 2383 rwgflags |= RWG_PERSISTENT; 2384 rwgflags |= RWG_FORCE; 2385 (void) run_work_group(Queue[qgrp]->qg_wgrp, 2386 rwgflags); 2387 } 2388 else 2389#endif /* _FFR_RUNPQG */ 2390 (void) runqueue(true, false, queuepersistent, 2391 true); 2392 |
|
| 2367 /* 2368 ** If queuepersistent but not in daemon mode then 2369 ** we're going to do the queue runner monitoring here. 2370 ** If in daemon mode then the monitoring will happen 2371 ** elsewhere. 2372 */ 2373 2374 if (OpMode != MD_DAEMON && queuepersistent) --- 2154 unchanged lines hidden --- | 2393 /* 2394 ** If queuepersistent but not in daemon mode then 2395 ** we're going to do the queue runner monitoring here. 2396 ** If in daemon mode then the monitoring will happen 2397 ** elsewhere. 2398 */ 2399 2400 if (OpMode != MD_DAEMON && queuepersistent) --- 2154 unchanged lines hidden --- |