Sophie

Sophie

distrib > Mandriva > 2009.1 > i586 > by-pkgid > 154ebaee0c7182b1ff55e93ff6ba2ade > files > 16

vsftpd-2.0.7-2mdv2009.1.src.rpm

diff -ruN vsftpd-2.0.7/README.ssl vsftpd-2.0.7.ssl/README.ssl
--- vsftpd-2.0.7/README.ssl	2008-02-02 02:30:40.000000000 +0100
+++ vsftpd-2.0.7.ssl/README.ssl	2008-11-28 12:04:04.000000000 +0100
@@ -27,10 +27,10 @@
 "#undef VSF_BUILD_SSL" to "#define VSF_BUILD_SSL".
 - "ssl_enable=YES" in your vsftpd.conf.
 - A SSL certificate. By default, an RSA certificate is looked for at the
-location /usr/share/ssl/certs/vsftpd.pem. To get an RSA certificate, either
+location /etc/pki/tls/certs/vsftpd.pem. To get an RSA certificate, either
 buy one from a certificate authority, or you can create your own self-signed
 certificate. If you have OpenSSL installed, you may find a "Makefile" in
-your shared certificates directory, e.g. /usr/share/ssl/certs. In that case,
+your shared certificates directory, e.g. /etc/pki/tls/certs. In that case,
 go to that directory and type e.g. "make vsftpd.pem". Then answer the
 questions you are asked. Alternatively, read the man page for "openssl".
 - Also be aware of the following SSL related parameters. Read the vsftpd.conf.5
diff -ruN vsftpd-2.0.7/tunables.c vsftpd-2.0.7.ssl/tunables.c
--- vsftpd-2.0.7/tunables.c	2008-11-28 11:25:12.000000000 +0100
+++ vsftpd-2.0.7.ssl/tunables.c	2008-11-28 12:02:42.000000000 +0100
@@ -130,7 +130,7 @@
 const char* tunable_deny_file = 0;
 const char* tunable_user_sub_token = 0;
 const char* tunable_email_password_file = "/etc/vsftpd/email_passwords";
-const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem";
+const char* tunable_rsa_cert_file = "/etc/pki/tls/certs/vsftpd.pem";
 const char* tunable_dsa_cert_file = 0;
 const char* tunable_ssl_ciphers = "DES-CBC3-SHA";
 const char* tunable_rsa_private_key_file = 0;
diff -ruN vsftpd-2.0.7/vsftpd.conf.5 vsftpd-2.0.7.ssl/vsftpd.conf.5
--- vsftpd-2.0.7/vsftpd.conf.5	2008-11-28 11:25:12.000000000 +0100
+++ vsftpd-2.0.7.ssl/vsftpd.conf.5	2008-11-28 12:03:46.000000000 +0100
@@ -935,7 +935,7 @@
 This option specifies the location of the RSA certificate to use for SSL
 encrypted connections.
 
-Default: /usr/share/ssl/certs/vsftpd.pem
+Default: /etc/pki/tls/certs/vsftpd.pem
 .TP
 .B rsa_private_key_file
 This option specifies the location of the RSA private key to use for SSL