Rename cs_set_ssl_certf to cs_set_ssl_certificate_file

diff --git a/NEWS b/NEWS
index aa92ec3..93e0a61 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Add autoconf m4 macro YAZ_DOC for YAZ documentation setup (docbook).
 
 SSL comstack now uses yaz.pem certificate file on server side
 by default. Certificate filename can be configured by calling
-comstack function cs_set_ssl_cert before cs_bind is used.
+comstack function cs_set_ssl_certificate_file before cs_bind is used.
 
 Fix bug regarding multiple calls to ZOOM_connection_connect.
 

diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h
index 160ab65..d49bc23 100644 (file)
--- a/include/yaz/comstack.h
+++ b/include/yaz/comstack.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: comstack.h,v 1.15 2004-04-30 19:10:35 adam Exp $
+ * $Id: comstack.h,v 1.16 2004-05-10 10:47:04 adam Exp $
  */
 
 #ifndef COMSTACK_H
@@ -151,7 +151,7 @@ YAZ_EXPORT void cs_get_host_args(const char *type_and_host, const char **args);
 YAZ_EXPORT int cs_complete_auto(const unsigned char *buf, int len);
 YAZ_EXPORT void *cs_get_ssl(COMSTACK cs);
 YAZ_EXPORT int cs_set_ssl_ctx(COMSTACK cs, void *ctx);
-YAZ_EXPORT int cs_set_ssl_certf(COMSTACK cs, const char *fname);
+YAZ_EXPORT int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname);
 YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len);
                                           
 /*

diff --git a/src/statserv.c b/src/statserv.c
index 7b211a6..cfe2ed0 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -5,7 +5,7 @@
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.7 2004-04-30 19:10:35 adam Exp $
+ * $Id: statserv.c,v 1.8 2004-05-10 10:47:04 adam Exp $
  */
 
 #include <stdio.h>
@@ -659,7 +659,7 @@ static int add_listener(char *where, int what)
        return -1;
     }
     if (*control_block.cert_fname)
-       cs_set_ssl_certf(l, control_block.cert_fname);
+       cs_set_ssl_certificate_file(l, control_block.cert_fname);
 
     if (cs_bind(l, ap, CS_SERVER) < 0)
     {

diff --git a/src/tcpip.c b/src/tcpip.c
index dae6c77..7a9e791 100644 (file)
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: tcpip.c,v 1.7 2004-05-03 09:00:50 adam Exp $
+ * $Id: tcpip.c,v 1.8 2004-05-10 10:47:04 adam Exp $
  */
 
 #include <stdio.h>
@@ -1131,7 +1131,7 @@ void *cs_get_ssl(COMSTACK cs)
     return sp->ssl;  
 }
 
-int cs_set_ssl_certf(COMSTACK cs, const char *fname)
+int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
 {
     struct tcpip_state *sp;
     if (!cs || cs->type != ssl_type)