First step in this merge. Mostly a bzr merge and then a cleanup of conflicts

and parts I want to/have to redo (because of ui-fix).

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/ssl_bogus.c b/lib/ssl_bogus.c
index 9c368c66..e7966f57 100644
--- a/lib/ssl_bogus.c
+++ b/lib/ssl_bogus.c
@@ -27,6 +27,10 @@
 
 int ssl_errno;
 
+void ssl_init( void )
+{
+}
+
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
 	return( NULL );
@@ -65,3 +69,8 @@ int ssl_pending( void *conn )
 {
 	return 0;
 }
+
+int ssl_pending( void *conn )
+{
+	return 0;
+}