openssl-1.0.0e: resolve conflicts

1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 826f761143..5d49e1a72b 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -340,7 +340,6 @@ static int acpt_write(BIO *b, const char *in, int inl)
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
-        BIO *dbio;
         int *ip;
         long ret=1;
         BIO_ACCEPT *data;
@@ -437,8 +436,8 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 ret=(long)data->bind_mode;
                 break;
         case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-/*              if (data->param_port) EAY EAY
+/*              dbio=(BIO *)ptr;
+                if (data->param_port) EAY EAY
                         BIO_set_port(dbio,data->param_port);
                 if (data->param_hostname)
                         BIO_set_hostname(dbio,data->param_hostname);