Attachment 875136 Details for Bug 1225397

[patch] Patch file for config.postfix

config.postfix.patch (text/plain), 2.88 KB, created by Freek de Kruijf on 2024-05-27 15:27:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freek de Kruijf

Created: 2024-05-27 15:27:58 UTC

Size: 2.88 KB

patch

obsolete

>--- postfix-SUSE/config.postfix	2024-05-17 17:48:57.723860941 +0200
>+++ postfix-SUSE-new/config.postfix	2024-05-27 16:36:32.407587902 +0200
>@@ -659,8 +659,9 @@
> 	# BNC#981097 config.postfix creates broken main.cf for tls client configuration
> 	    warn_user 1>&2 "You have activated POSTFIX_SMTP_TLS_SERVER, but you don't have created or configured certificates."
> 	else
>-		$PCONF -e "smtpd_use_tls = yes"
>-		$PCONF -e "smtpd_enforce_tls = no"
>+		# Following two parameters are deprecated and parameter smtpd_tls_security_level covers this situation
>+		#$PCONF -e "smtpd_use_tls = yes"
>+		#$PCONF -e "smtpd_enforce_tls = no"
> 		$PCONF -e "smtpd_tls_security_level = may"
> 		if [ -n "$POSTFIX_TLS_CAFILE" -a -s "$POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE" ]; then
> 		    $PCONF -e "smtpd_tls_CAfile = $POSTFIX_SSL_PATH/$POSTFIX_TLS_CAFILE"
>@@ -693,8 +694,9 @@
> 		$PCONF -e "smtpd_recipient_restrictions = permit_tls_clientcerts, $CURRENT"
> 	fi
>     else
>-	$PCONF -e "smtpd_use_tls = no"
>-	$PCONF -e "smtpd_enforce_tls = no"
>+	#Following two parameters are deprecated and smtpd_tls_security_level covers this situation
>+	#$PCONF -e "smtpd_use_tls = no"
>+	#$PCONF -e "smtpd_enforce_tls = no"
> 	$PCONF -e "smtpd_tls_security_level ="
> 	$PCONF -e "smtpd_tls_CAfile ="
> 	$PCONF -e "smtpd_tls_CApath ="
>@@ -706,18 +708,21 @@
>     fi
> 
>     if test "$POSTFIX_SMTP_TLS_CLIENT" == "no"; then
>-	    $PCONF -e "smtp_use_tls = no"
>-	    $PCONF -e "smtp_enforce_tls = no"
>+	    #Following two parameters are deprecated and smtpd_tls_security_level covers this situation
>+	    #$PCONF -e "smtp_use_tls = no"
>+	    #$PCONF -e "smtp_enforce_tls = no"
> 	    $PCONF -e "smtp_tls_security_level ="
>     fi
>     if test "$POSTFIX_SMTP_TLS_CLIENT" == "yes"; then
>-	    $PCONF -e "smtp_use_tls = yes"
>-	    $PCONF -e "smtp_enforce_tls = no"
>+	    #Following two parameters are deprecated and smtpd_tls_security_level covers this situation
>+	    #$PCONF -e "smtp_use_tls = yes"
>+	    #$PCONF -e "smtp_enforce_tls = no"
> 	    $PCONF -e "smtp_tls_security_level = may"
>     fi
>     if test "$POSTFIX_SMTP_TLS_CLIENT" == "must"; then
>-	    $PCONF -e "smtp_use_tls = yes"
>-	    $PCONF -e "smtp_enforce_tls = yes"
>+	    #Following two parameters are deprecated and smtpd_tls_security_level covers this situation
>+	    #$PCONF -e "smtp_use_tls = yes"
>+	    #$PCONF -e "smtp_enforce_tls = yes"
> 	    $PCONF -e "smtp_tls_security_level = encrypt"
>     fi
>     if test "$POSTFIX_SMTP_TLS_CLIENT" = "yes" -o "$POSTFIX_SMTP_TLS_CLIENT" = "must" ; then
>@@ -1363,7 +1368,8 @@
> update_cf() {
>     while test "x$1" != "x" ; do
>         TMPFILE=$(mktemp /tmp/postfix.${1}.XXXXXX) || exit 1
>-	B=$( find /etc/postfix/${1} -printf %CY%Cm%Cd%CI%CM )
>+	#Ck instead of CI; k is 24 hours clock; I is 12 hours clock
>+	B=$( find /etc/postfix/${1} -printf %CY%Cm%Cd%Ck%CM )
> 	cp /etc/postfix/${1} "@conf_backup_dir@/${1}$B"
> 	cp /etc/postfix/${1} "@conf_backup_dir@/${1}"
> 	eval gen_${1/\./_} > $TMPFILE

Actions: View | Diff

Attachments on bug 1225397: 875136