Partially uncommit the botched commit r5117 so I can create proper changelogs.

svn path=/branches/BRANCH_6-3/; revision=5212

diff --git a/socket.c b/socket.c
index 4c074ec21ca4979c27a06308f18abab283f51ef4..1af4a3933330099e776e162a687f102bf1a74165 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -800,8 +800,8 @@ int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char
         struct stat randstat;
         int i;
 
-       SSLeay_add_ssl_algorithms();
        SSL_load_error_strings();
+       SSLeay_add_ssl_algorithms();
        
 #ifdef SSL_ENABLE
         if (stat("/dev/random", &randstat)  &&
@@ -851,8 +851,6 @@ int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char
                return(-1);
        }
 
-       SSL_CTX_set_options(_ctx[sock], SSL_OP_ALL);
-
        if (certck) {
                SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback);
        } else {
@@ -903,8 +901,9 @@ int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char
                SSL_use_RSAPrivateKey_file(_ssl_context[sock], mykey, SSL_FILETYPE_PEM);
        }
 
-       if (SSL_set_fd(_ssl_context[sock], sock) == 0 
-           || SSL_connect(_ssl_context[sock]) < 1) {
+       SSL_set_fd(_ssl_context[sock], sock);
+       
+       if(SSL_connect(_ssl_context[sock]) < 1) {
                ERR_print_errors_fp(stderr);
                SSL_CTX_free(_ctx[sock]);
                _ctx[sock] = NULL;

diff --git a/uid.c b/uid.c
index a4164b442c96cf442ae11f4d2a068cacfa69430f..82bb4addddfde61753f679908f12ca18268b2fd7 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -612,10 +612,8 @@ void write_saved_lists(struct query *hostlist, const char *idfile)
     /* either nuke the file or write updated last-seen IDs */
     if (!idcount && !scratchlist)
     {
-       if (outlevel >= O_DEBUG) {
-           if (access(idfile, F_OK) == 0)
-                   report(stdout, GT_("Deleting fetchids file.\n"));
-       }
+       if (outlevel >= O_DEBUG)
+           report(stdout, GT_("Deleting fetchids file.\n"));
        if (unlink(idfile) && errno != ENOENT)
            report(stderr, GT_("Error deleting %s: %s\n"), idfile, strerror(errno));
     } else {