rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

MozNSS Compat. Layer: Fix typos, and spelling in the README file header

Browse Source 
Resolves: #1564161
This commit is contained in:
Matúš Honěk 2018-04-05 15:52:27 +02:00
parent 7150aca353
commit 44ef9ba558
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openldap-tlsmc.patch
View File

@ -1,7 +1,7 @@
MozNSS Interception Code MozNSS Interception Code
Author: Matus Honek <mhonek@redhat.com> Author: Matus Honek <mhonek@redhat.com>
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 diff --git a/configure.in b/configure.in
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@ -330,16 +330,16 @@ new file mode 100644
+#define TLSMC_IS_TEMPORARY 2 +#define TLSMC_IS_TEMPORARY 2
+ +
+#define DONOTEDIT \ +#define DONOTEDIT \
+ "This file is auto-generated by MOZNSS Compatibility Layer of OpenLDAP software.\n" \ + "This file is auto-generated by the MozNSS Compatibility Layer of OpenLDAP software.\n" \
+ "This layer is not a part of upstream distributed 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" \ + "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" \ + "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 man (5) of slapd.conf, slapd-config, and ldap.conf for more information." + "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_HEADER "-----BEGIN CERTIFICATE-----"
+#define PEM_CERT_FOOTER "-----END CERTIFICATE-----" +#define PEM_CERT_FOOTER "-----END CERTIFICATE-----"
+#define PEM_KEY_HEADER "-----BEGIN PRIVATE KEY-----" +#define PEM_KEY_HEADER "-----BEGIN PRIVATE KEY-----"
+#define PEM_KEY_FOOTER "-----END 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 +#ifdef LDAP_R_COMPILE
+ldap_pvt_thread_mutex_t tlsmc_mutex; +ldap_pvt_thread_mutex_t tlsmc_mutex;
@ -930,9 +930,9 @@ new file mode 100644
+ +
+ if ( 0 != mkdir( dir, S_IRWXU /* u+rwx */ ) ) { + if ( 0 != mkdir( dir, S_IRWXU /* u+rwx */ ) ) {
+ Debug( LDAP_DEBUG_ANY, + 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 ); + 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; + rv = 0;
+ goto bail; + goto bail;
+ } + }
@ -943,9 +943,9 @@ new file mode 100644
+ cacerts_dir = PR_smprintf( "%s/%s", dir, TLSMC_CACERTS_DIR_NAME ); + cacerts_dir = PR_smprintf( "%s/%s", dir, TLSMC_CACERTS_DIR_NAME );
+ if ( 0 != mkdir( cacerts_dir, S_IRWXU /* u+rwx */ ) ) { + if ( 0 != mkdir( cacerts_dir, S_IRWXU /* u+rwx */ ) ) {
+ Debug( LDAP_DEBUG_ANY, + 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 ); + 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; + rv = 0;
+ goto bail; + goto bail;
+ } + }