Преглед на файлове

Fix a couple typos in README.SSL.md and add a little more info

to the log message if SSL_CTX_use_certificate_file() fails.
John C. Frickson преди 10 години
родител
ревизия
926dc67b5b
променени са 2 файла, в които са добавени 6 реда и са изтрити 4 реда
  1. 3 3
      README.SSL.md
  2. 3 1
      src/nrpe.c

+ 3 - 3
README.SSL.md

@@ -224,7 +224,7 @@ If you have the default `/etc/openssl.cnf`, either change it, or as root, do:
         cd /usr/local/nagios/etc/ssl
         mkdir demoCA
         mkdir demoCA/newcerts
-        touch index.txt
+        touch demoCA/index.txt
 		echo "01" > demoCA/serial
         chown -R root.root demoCA
         chmod 700 demoCA
@@ -232,13 +232,13 @@ If you have the default `/etc/openssl.cnf`, either change it, or as root, do:
         chmod 600 demoCA/serial
         chmod 600 demoCA/index.txt
 
-Now, sign the CRSs. As root, do the following:
+Now, sign the CSRs. As root, do the following:
 
         cd /usr/local/nagios/etc/ssl
         openssl ca -days 365 -notext -md sha256 \
            -keyfile ca/ca_key.pem -cert ca/ca_cert.pem \
            -in server_certs/db_server.csr \
-           -out server_certs/db_server.pem \
+           -out server_certs/db_server.pem
         chown root.nagios server_certs/db_server.pem
         chmod 440 server_certs/db_server.pem
         openssl ca -days 365 -notext -md sha256

+ 3 - 1
src/nrpe.c

@@ -350,7 +350,9 @@ int main(int argc, char **argv){
 		if (sslprm.cert_file != NULL) {
 			if (!SSL_CTX_use_certificate_file(ctx, sslprm.cert_file, SSL_FILETYPE_PEM)) {
 				SSL_CTX_free(ctx);
-				syslog(LOG_ERR, "Error: could not use certificate file '%s'", sslprm.cert_file);
+				while ((x = ERR_get_error()) != 0)
+					syslog(LOG_ERR, "Error: could not use certificate file %s : %s",
+						sslprm.cert_file, ERR_error_string(x, NULL));
 				exit(STATE_CRITICAL);
 			}
 			if (!SSL_CTX_use_PrivateKey_file(ctx, sslprm.privatekey_file, SSL_FILETYPE_PEM)) {