Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a couple of #ifdef USE_TLS blocks to help MKCRYPTO=no link.

This commit is contained in:
mrg 2008-02-04 02:21:30 +00:00
parent 5913e24b1e
commit df589eb5b4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/dist/postfix/src/smtp/smtp.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: smtp.c,v 1.1.1.14 2007/08/02 08:05:26 heas Exp $ */
/* $NetBSD: smtp.c,v 1.2 2008/02/04 02:21:30 mrg Exp $ */
/*++
/* NAME
@ -871,10 +871,14 @@ static void pre_init(char *unused_name, char **unused_argv)
VAR_SMTP_SASL_ENABLE);
#endif
#ifdef USE_TLS
if (*var_smtp_tls_level)
use_tls = tls_level_lookup(var_smtp_tls_level) > TLS_LEV_NONE;
else
use_tls = var_smtp_enforce_tls || var_smtp_use_tls;
#else
use_tls = 0;
#endif
/*
* Initialize the TLS data before entering the chroot jail

6
gnu/dist/postfix/src/smtpd/smtpd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: smtpd.c,v 1.20 2007/08/02 08:26:19 heas Exp $ */
/* $NetBSD: smtpd.c,v 1.21 2008/02/04 02:21:31 mrg Exp $ */
/*++
/* NAME
@ -4229,6 +4229,7 @@ static void pre_jail_init(char *unused_name, char **unused_argv)
VAR_SMTPD_SASL_ENABLE);
#endif
#ifdef USE_TLS
/*
* XXX Temporary fix to pretend that we consistently implement TLS
* security levels. We implement only a subset for now. If we implement
@ -4260,6 +4261,9 @@ static void pre_jail_init(char *unused_name, char **unused_argv)
}
enforce_tls = var_smtpd_tls_wrappermode || var_smtpd_enforce_tls;
use_tls = var_smtpd_use_tls || enforce_tls;
#else
enforce_tls = use_tls = 0;
#endif
/*
* Keys can only be loaded when running with suitable permissions. When