-crlf option.
diff --git a/apps/s_server.c b/apps/s_server.c
index 9a81418..afe4182 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -56,9 +56,7 @@
* [including the GNU Public Licence.]
*/
-#ifdef APPS_CRLF
-# include <assert.h>
-#endif
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -169,9 +167,7 @@
static int s_nbio=0;
#endif
static int s_nbio_test=0;
-#ifdef APPS_CRLF /* won't be #ifdef'd in next release */
int s_crlf=0;
-#endif
static SSL_CTX *ctx=NULL;
static int www=0;
@@ -219,9 +215,7 @@
BIO_printf(bio_err," -nbio - Run with non-blocking IO\n");
#endif
BIO_printf(bio_err," -nbio_test - test with the non-blocking test bio\n");
-#ifdef APPS_CRLF
BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n");
-#endif
BIO_printf(bio_err," -debug - Print more output\n");
BIO_printf(bio_err," -state - Print the SSL states\n");
BIO_printf(bio_err," -CApath arg - PEM format directory of CA's\n");
@@ -525,10 +519,8 @@
{ hack=1; }
else if (strcmp(*argv,"-state") == 0)
{ state=1; }
-#ifdef APPS_CRLF
else if (strcmp(*argv,"-crlf") == 0)
{ s_crlf=1; }
-#endif
else if (strcmp(*argv,"-quiet") == 0)
{ s_quiet=1; }
else if (strcmp(*argv,"-bugs") == 0)
@@ -813,7 +805,6 @@
if (i <= 0) continue;
if (FD_ISSET(fileno(stdin),&readfds))
{
-#ifdef APPS_CRLF
if (s_crlf)
{
int j, lf_num;
@@ -837,7 +828,6 @@
assert(lf_num == 0);
}
else
-#endif
i=read(fileno(stdin),buf,bufsize);
if (!s_quiet)
{
