From 44ef9ba55878551171a3f2c178e808b8d91a96d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Hon=C4=9Bk?= Date: Thu, 5 Apr 2018 15:52:27 +0200 Subject: [PATCH] MozNSS Compat. Layer: Fix typos, and spelling in the README file header Resolves: #1564161 --- openldap-tlsmc.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openldap-tlsmc.patch b/openldap-tlsmc.patch index 405e54f..ded043d 100644 --- a/openldap-tlsmc.patch +++ b/openldap-tlsmc.patch @@ -1,7 +1,7 @@ MozNSS Interception Code Author: Matus Honek -Date: Wed Feb 21 20:04:11 CET 2018 +Date: Thu Apr 5 15:47:44 CEST 2018 diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -330,16 +330,16 @@ new file mode 100644 +#define TLSMC_IS_TEMPORARY 2 + +#define DONOTEDIT \ -+ "This file is auto-generated by MOZNSS Compatibility Layer of OpenLDAP software.\n" \ -+ "This layer is not a part of upstream distributed OpenLDAP software.\n" \ -+ "Please, file any related bugs with your GNU/Linux distribution.\n" \ -+ "Do not edit directly. Rather, change your configuration to use OpenSSL-style TLS options, so that this does not need to be generated anymore.\n" \ -+ "Please, refer to man (5) of slapd.conf, slapd-config, and ldap.conf for more information." ++ "This file is auto-generated by the MozNSS Compatibility Layer of OpenLDAP software.\n" \ ++ "This layer is not part of the OpenLDAP software distributed in upstream.\n" \ ++ "Please file any related bugs with your GNU/Linux distribution.\n" \ ++ "Do not edit contents of this directory structure directly. Rather, change your configuration to use the OpenSSL-style TLS options, so that this directory structure does not need to be generated anymore.\n" \ ++ "Please refer to the slapd.conf(5), slapd-config(5), and ldap.conf(5) man pages for more information." +#define PEM_CERT_HEADER "-----BEGIN CERTIFICATE-----" +#define PEM_CERT_FOOTER "-----END CERTIFICATE-----" +#define PEM_KEY_HEADER "-----BEGIN PRIVATE KEY-----" +#define PEM_KEY_FOOTER "-----END PRIVATE KEY-----" -+#define README_HEADER "Contents of this file are hashed and used as a part of a name of the parent directory.\n" ++#define README_HEADER "The contents of this file are hashed and used as part of the name of the parent directory.\n" + +#ifdef LDAP_R_COMPILE +ldap_pvt_thread_mutex_t tlsmc_mutex; @@ -930,9 +930,9 @@ new file mode 100644 + + if ( 0 != mkdir( dir, S_IRWXU /* u+rwx */ ) ) { + Debug( LDAP_DEBUG_ANY, -+ "tlsmc_prepare_dir: WARN: cound not create the PEM directory.\n", ++ "tlsmc_prepare_dir: WARN: could not create the PEM directory.\n", + 0, 0, 0 ); -+ perror( "tlsmc_prepare_dir: WARN: cound not create the PEM directory" ); ++ perror( "tlsmc_prepare_dir: WARN: could not create the PEM directory" ); + rv = 0; + goto bail; + } @@ -943,9 +943,9 @@ new file mode 100644 + cacerts_dir = PR_smprintf( "%s/%s", dir, TLSMC_CACERTS_DIR_NAME ); + if ( 0 != mkdir( cacerts_dir, S_IRWXU /* u+rwx */ ) ) { + Debug( LDAP_DEBUG_ANY, -+ "tlsmc_prepare_dir: WARN: cound not create the subdirectory.\n", ++ "tlsmc_prepare_dir: WARN: could not create the subdirectory.\n", + 0, 0, 0 ); -+ perror( "tlsmc_prepare_dir: WARN: cound not create the subdirectory" ); ++ perror( "tlsmc_prepare_dir: WARN: could not create the subdirectory" ); + rv = 0; + goto bail; + }