components/openldap/patches/07-fopenF.patch
author zihao.zhu@oracle.com <zihao.zhu@oracle.com>
Thu, 20 Oct 2016 09:25:22 -0700
changeset 7137 4f2e13d4a600
parent 5911 a8d897c4c442
permissions -rw-r--r--
24594042 OpenLDAP man page(s) show incorrect interface stability level
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5911
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     1
Fixes problem with openldap calling fopen() without F flag.
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     2
Patch was developed in-house; it is Solaris specific and
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     3
will not be contributed upstream.
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     4
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     5
--- openldap-2.4.44/libraries/liblber/debug.c.old	Wed Feb 24 13:31:09 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     6
+++ openldap-2.4.44/libraries/liblber/debug.c	Wed Feb 24 13:31:32 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     7
@@ -53,10 +53,10 @@
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     8
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
     9
 #ifdef HAVE_WINSOCK
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    10
 	if( log_file == NULL ) {
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    11
-		log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "openldap.log", "w" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    12
+		log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "openldap.log", "wF" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    13
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    14
 		if ( log_file == NULL ) {
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    15
-			log_file = fopen( "openldap.log", "w" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    16
+			log_file = fopen( "openldap.log", "wF" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    17
 			if ( log_file == NULL ) return;
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    18
 		}
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    19
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    20
--- openldap-2.4.44/libraries/libldap/fetch.c.old	Wed Feb 24 13:31:41 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    21
+++ openldap-2.4.44/libraries/libldap/fetch.c	Wed Feb 24 13:31:55 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    22
@@ -79,7 +79,7 @@
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    23
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    24
 		ldap_pvt_hex_unescape( p );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    25
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    26
-		url = fopen( p, "rb" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    27
+		url = fopen( p, "rbF" );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    28
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    29
 		ber_memfree( p );
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    30
 	} else {
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    31
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    32
--- openldap-2.4.44/libraries/libldap/init.c.old	Wed Feb 24 13:32:07 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    33
+++ openldap-2.4.44/libraries/libldap/init.c	Wed Feb 24 13:32:19 2016
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    34
@@ -167,7 +167,7 @@
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    35
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    36
 	Debug(LDAP_DEBUG_TRACE, "ldap_init: trying %s\n", file, 0, 0);
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    37
 
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    38
-	fp = fopen(file, "r");
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    39
+	fp = fopen(file, "rF");
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    40
 	if(fp == NULL) {
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    41
 		/* could not open file */
a8d897c4c442 PSARC/2016/225 OpenLDAP Update to 2.4.44
zihao.zhu@oracle.com <zihao.zhu@oracle.com>
parents:
diff changeset
    42
 		return;