/[smeserver]/rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-TLS.patch
ViewVC logotype

Diff of /rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-TLS.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by unnilennium, Fri Jun 17 14:39:29 2016 UTC Revision 1.3 by unnilennium, Wed Aug 3 05:08:58 2016 UTC
# Line 1  Line 1 
1  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable
2  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable  1969-12-31 19:00:00.000000000 -0500  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable  1969-12-31 19:00:00.000000000 -0500
3  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable      2016-06-17 10:35:05.722000000 -0400  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSEnable      2016-06-17 11:01:16.668000000 -0400
4  @@ -0,0 +1 @@  @@ -0,0 +1 @@
5  +on  +on
6  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired
7  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired        1969-12-31 19:00:00.000000000 -0500  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired        1969-12-31 19:00:00.000000000 -0500
8  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired    2016-06-17 10:35:19.834000000 -0400  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSRequired    2016-06-17 11:01:16.668000000 -0400
9  @@ -0,0 +1 @@  @@ -0,0 +1 @@
10  +off  +on
11  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient
12  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient    1969-12-31 19:00:00.000000000 -0500  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient    1969-12-31 19:00:00.000000000 -0500
13  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient        2016-06-17 10:35:31.626000000 -0400  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/db/configuration/defaults/ftp/TLSVerifyClient        2016-06-17 11:01:16.668000000 -0400
14  @@ -0,0 +1 @@  @@ -0,0 +1 @@
15  +off  +off
16  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS  diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS
17  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS      1969-12-31 19:00:00.000000000 -0500  --- e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS      1969-12-31 19:00:00.000000000 -0500
18  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS  2016-06-17 10:34:09.385000000 -0400  +++ e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS  2016-06-17 10:56:56.000000000 -0400
19  @@ -0,0 +1,32 @@  @@ -0,0 +1,37 @@
20  +{  +{
21  +       #check if TLS is enabled  +       #check if TLS is enabled
22  +        if (($ftp{TLSEnable} || 'yes') eq 'yes') {  +        if (($ftp{TLSEnable} || 'on') eq 'on') {
23  +  +
24  +        #check if TLS is required: values "on", "off"  +        #check if TLS is required: values "on", "off"
25  +        #if "on" normal ftp connections are dropped  +        #if "on" normal ftp connections are dropped
26  +        my $tlsrequired = $ftp{'TLSRequired'} || "off";  +        my $tlsrequired = $ftp{'TLSRequired'} || "on";
27  +        my $tlsclient = $ftp{'TLSVerifyClient'} || "off";  +        my $tlsclient = $ftp{'TLSVerifyClient'} || "off";
28  +        #use the same crt and key of httpd  +        #use the same crt and key of httpd
29  +        my $crt = $modSSL{'crt'} ||  +        my $crt = $modSSL{'crt'} ||
# Line 31  diff -Nur e-smith-proftpd-2.6.0.old/root Line 31  diff -Nur e-smith-proftpd-2.6.0.old/root
31  +  +
32  +       my $key = $modSSL{'key'} ||  +       my $key = $modSSL{'key'} ||
33  +        "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key";  +        "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key";
34    +        my $chain_file = $modSSL{CertificateChainFile} ||
35    +        "# no chain cert";
36    +
37    +       $chain_file = ( $chain_file eq "# no chain cert" )? $chain_file  : "TLSCertificateChainFile $chain_file";
38  +  +
39  +       $OUT .= <<SSL_END;  +       $OUT .= <<SSL_END;
40  +  +
# Line 41  diff -Nur e-smith-proftpd-2.6.0.old/root Line 45  diff -Nur e-smith-proftpd-2.6.0.old/root
45  +TLSOptions                 NoCertRequest AllowClientRenegotiations  +TLSOptions                 NoCertRequest AllowClientRenegotiations
46  +TLSRSACertificateFile      $crt  +TLSRSACertificateFile      $crt
47  +TLSRSACertificateKeyFile   $key  +TLSRSACertificateKeyFile   $key
48    +$chain_file
49  +TLSVerifyClient            $tlsclient  +TLSVerifyClient            $tlsclient
50  +TLSRequired                $tlsrequired  +TLSRequired                $tlsrequired
51  +</IfModule>  +</IfModule>

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed