diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-02 17:51:59 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-02 17:51:59 -0500 |
| commit | b074e1348343224f22a6c58eba38bd565cabd24a (patch) | |
| tree | dc9dc6a9c5046129bcdf2523c94969503fb1a0cc /vio/viossl.c | |
| parent | b2978f9ee8bc9e4f44299ab0ffcb1bc4b99cfb89 (diff) | |
| parent | deb03b93ece12ee8ac0fe144455912730efcfc26 (diff) | |
| download | mariadb-git-b074e1348343224f22a6c58eba38bd565cabd24a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 180c7a50fa7..b5fd0e11c02 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -26,6 +26,10 @@ #ifdef HAVE_OPENSSL #ifdef __NETWARE__ + +/* yaSSL already uses BSD sockets */ +#ifndef HAVE_YASSL + /* The default OpenSSL implementation on NetWare uses WinSock. This code allows us to use the BSD sockets. @@ -47,6 +51,7 @@ static int SSL_set_fd_bsd(SSL *s, int fd) #define SSL_set_fd(A, B) SSL_set_fd_bsd((A), (B)) +#endif /* HAVE_YASSL */ #endif /* __NETWARE__ */ @@ -82,7 +87,7 @@ int vio_ssl_read(Vio *vio, gptr buf, int size) { int r; DBUG_ENTER("vio_ssl_read"); - DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d, ssl_: 0x%p", + DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d, ssl_: 0x%lx", vio->sd, buf, size, vio->ssl_arg)); r= SSL_read((SSL*) vio->ssl_arg, buf, size); @@ -99,7 +104,7 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size) { int r; DBUG_ENTER("vio_ssl_write"); - DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size)); + DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d", vio->sd, buf, size)); r= SSL_write((SSL*) vio->ssl_arg, buf, size); #ifndef DBUG_OFF |