From cvs-return-6023-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Fri Jul 30 20:50:05 2004 Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 55910 invoked from network); 30 Jul 2004 20:50:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 30 Jul 2004 20:50:04 -0000 Received: (qmail 50392 invoked by uid 500); 30 Jul 2004 20:50:04 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 50289 invoked by uid 500); 30 Jul 2004 20:50:03 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 50275 invoked by uid 500); 30 Jul 2004 20:50:03 -0000 Delivered-To: apmail-apr-util-cvs@apache.org X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 30 Jul 2004 20:50:02 -0000 Message-ID: <20040730205002.55882.qmail@minotaur.apache.org> From: bnicholes@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/ldap apr_ldap_init.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/07/30 13:50:02 Modified: ldap apr_ldap_init.c Log: Clean up for the Novell and Netscape SDKs Revision Changes Path 1.2 +6 -6 apr-util/ldap/apr_ldap_init.c Index: apr_ldap_init.c =================================================================== RCS file: /home/cvs/apr-util/ldap/apr_ldap_init.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_ldap_init.c 30 Jul 2004 19:40:44 -0000 1.1 +++ apr_ldap_init.c 30 Jul 2004 20:50:02 -0000 1.2 @@ -50,8 +50,8 @@ /* Netscape sdk only supports a cert7.db file */ - if (st->cert_file_type == LDAP_CA_TYPE_CERT7_DB) { - rc = ldapssl_client_init(st->cert_auth_file, NULL); + if (cert_file_type == APR_LDAP_CA_TYPE_CERT7_DB) { + rc = ldapssl_client_init(cert_auth_file, NULL); } else { *reason = "LDAP: Invalid certificate type: " @@ -68,12 +68,12 @@ rc = ldapssl_client_init(NULL, NULL); if (LDAP_SUCCESS == rc) { - if (st->cert_file_type == LDAP_CA_TYPE_BASE64) { - rc = ldapssl_add_trusted_cert(st->cert_auth_file, + if (cert_file_type == APR_LDAP_CA_TYPE_BASE64) { + rc = ldapssl_add_trusted_cert((void*)cert_auth_file, LDAPSSL_CERT_FILETYPE_B64); } else { - rc = ldapssl_add_trusted_cert(st->cert_auth_file, + rc = ldapssl_add_trusted_cert((void*)cert_auth_file, LDAPSSL_CERT_FILETYPE_DER); } @@ -84,7 +84,7 @@ } else { *reason = "LDAP: Invalid certificate type: " - "DER or BASE64 type required"); + "DER or BASE64 type required"; rc = -1; }