diff options
Diffstat (limited to 'contrib/sendmail/src/conf.c')
| -rw-r--r-- | contrib/sendmail/src/conf.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index a681575ef38a..0cbb88e34ddf 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: conf.c,v 8.1128 2007/04/03 21:32:29 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1136 2007/10/10 00:06:45 ca Exp $") #include <sm/sendmail.h> #include <sendmail/pathnames.h> @@ -5316,17 +5316,8 @@ sm_syslog(level, id, fmt, va_alist) save_errno = errno; if (id == NULL) - { id = "NOQUEUE"; - idlen = strlen(id) + SyslogPrefixLen; - } - else if (strcmp(id, NOQID) == 0) - { - id = ""; - idlen = SyslogPrefixLen; - } - else - idlen = strlen(id) + SyslogPrefixLen; + idlen = strlen(id) + SyslogPrefixLen; buf = buf0; bufsize = sizeof(buf0); @@ -6024,6 +6015,10 @@ char *OsCompileOptions[] = char *FFRCompileOptions[] = { +#if _FFR_ADDR_TYPE_MODES + /* more info in {addr_type}, requires m4 changes! */ + "_FFR_ADDR_TYPE_MODES", +#endif /* _FFR_ADDR_TYPE_MODES */ #if _FFR_ALLOW_SASLINFO /* DefaultAuthInfo can be specified by user. */ /* DefaultAuthInfo doesn't really work in 8.13 anymore. */ @@ -6094,6 +6089,10 @@ char *FFRCompileOptions[] = "_FFR_DPO_CS", #endif /* _FFR_DPO_CS */ +#if _FFR_DPRINTF_MAP + /* dprintf map for logging */ + "_FFR_DPRINTF_MAP", +#endif /* _FFR_DPRINTF_MAP */ #if _FFR_DROP_TRUSTUSER_WARNING /* ** Don't issue this warning: @@ -6222,6 +6221,10 @@ char *FFRCompileOptions[] = /* Old mime7to8 code, the new is broken for at least one example. */ "_FFR_MIME7TO8_OLD", #endif /* _FFR_MAX_SLEEP_TIME */ +#if _FFR_MORE_MACROS + /* allow more long macro names ("unprintable" characters). */ + "_FFR_MORE_MACROS", +#endif /* _FFR_MORE_MACROS */ #if _FFR_MSG_ACCEPT /* allow to override "Message accepted for delivery" */ "_FFR_MSG_ACCEPT", @@ -6235,6 +6238,10 @@ char *FFRCompileOptions[] = /* Disable PIPELINING, delay client if used. */ "_FFR_NO_PIPE", #endif /* _FFR_NO_PIPE */ +#if _FFR_LDAP_NETWORK_TIMEOUT + /* set LDAP_OPT_NETWORK_TIMEOUT if available (-c) */ + "_FFR_LDAP_NETWORK_TIMEOUT", +#endif /* _FFR_LDAP_NETWORK_TIMEOUT */ #if _FFR_LOG_NTRIES /* log ntries=, from Nik Clayton of FreeBSD */ "_FFR_LOG_NTRIES", @@ -6280,6 +6287,18 @@ char *FFRCompileOptions[] = /* Random shuffle for queue sorting. */ "_FFR_RHS", #endif /* _FFR_RHS */ +#if _FFR_RUNPQG + /* + ** allow -qGqueue_group -qp to work, i.e., + ** restrict a persistent queue runner to a queue group. + */ + + "_FFR_RUNPQG", +#endif /* _FFR_RUNPQG */ +#if _FFR_SESSID + /* session id (for logging) */ + "_FFR_SESSID", +#endif /* _FFR_SESSID */ #if _FFR_SHM_STATUS /* Donated code (unused). */ "_FFR_SHM_STATUS", |