merged in upstream r379 (somewhere after 1.2-3).

Just one trivial conflict in the jabber Makefile, went smoothly.

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/ssl_nss.c b/lib/ssl_nss.c
index 218b3a80..eba3c441 100644
--- a/lib/ssl_nss.c
+++ b/lib/ssl_nss.c
@@ -168,6 +168,12 @@ int ssl_write( void *conn, const char *buf, int len )
 	return( PR_Write ( ((struct scd*)conn)->prfd, buf, len ) );
 }
 
+/* See ssl_openssl.c for an explanation. */
+int ssl_pending( void *conn )
+{
+	return 0;
+}
+
 void ssl_disconnect( void *conn_ )
 {
 	struct scd *conn = conn_;