[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm back-ldbm.h, 1.11, 1.12 ldbm_attrcrypt.c, 1.10, 1.11

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4455/ldap/servers/slapd/back-ldbm

Modified Files:
	back-ldbm.h ldbm_attrcrypt.c 
Log Message:
Resolves: #339031
Summary: Solaris: warnings reported by the Solaris compiler



Index: back-ldbm.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- back-ldbm.h	16 Oct 2007 17:30:58 -0000	1.11
+++ back-ldbm.h	19 Oct 2007 02:09:24 -0000	1.12
@@ -54,8 +54,10 @@
 
 /* needed by at least HPUX and Solaris, to define off64_t */
 #ifdef DB_USE_64LFS
+#if !defined(_LARGEFILE64_SOURCE)
 #define _LARGEFILE64_SOURCE
 #endif
+#endif
 
 /* A bunch of random system headers taken from all the source files, no source file
should #include
    any system headers now */


Index: ldbm_attrcrypt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ldbm_attrcrypt.c	18 Oct 2007 00:08:34 -0000	1.10
+++ ldbm_attrcrypt.c	19 Oct 2007 02:09:24 -0000	1.11
@@ -588,7 +588,7 @@
 	output_buffer_length = in_size + 16;
 	output_buffer = (unsigned char *)slapi_ch_malloc(output_buffer_length);
 	/* Now call NSS to do the cipher op */
-	iv_item.data = "aaaaaaaaaaaaaaaa"; /* ptr to an array of IV bytes */
+	iv_item.data = (unsigned char *)"aaaaaaaaaaaaaaaa"; /* ptr to an array of IV
bytes */
 	iv_item.len = acs->ace->iv_length; /* length of the array of IV bytes */
 	security_parameter = slapd_pk11_ParamFromIV(acs->ace->cipher_mechanism,
&iv_item);
 	if (NULL == security_parameter) {