From b2ef3ec1b6a5e7e3fb8fcd06d51ccdb9cf3f8826 Mon Sep 17 00:00:00 2001
From: stskeeps <devnull@localhost>
Date: Tue, 25 Dec 2001 13:29:50 +0000
Subject: [PATCH] crypt fix

---
 Changes          | 1 +
 extras/burst.c   | 2 +-
 include/config.h | 2 +-
 src/s_conf.c     | 9 +++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Changes b/Changes
index 1ed3122c3..56de6495f 100644
--- a/Changes
+++ b/Changes
@@ -1030,3 +1030,4 @@ seen. gmtime warning still there
 - beta5 released
 - Fixed a bug causing /map to give away Ulines
 - Fixed a possible segfault in m_stats
+- Bug with crypt not working for /oper fixed
diff --git a/extras/burst.c b/extras/burst.c
index 723b61e05..9b00a6fc8 100644
--- a/extras/burst.c
+++ b/extras/burst.c
@@ -139,7 +139,7 @@ int create_client(const char *hostname, const int hostport) {
   /* winlocal
   if ((descript=socket(PF_INET, SOCK_STREAM, 0)) < 0)
   */
-  if ((descript=socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)		// winlocal
+  if ((descript=socket(PF_INET, SOCK_STREAM, 0)) == -1)		// winlocal
     fatal("socket");
 
   name_to_number(AF_INET, hostname, hostport, &hostaddr, &adlen);
diff --git a/include/config.h b/include/config.h
index e727a594c..cedcbffcf 100644
--- a/include/config.h
+++ b/include/config.h
@@ -448,7 +448,7 @@
  */
 
 #define MAXTARGETS		20
-#define TARGET_DELAY		120
+#define TARGET_DELAY		15
 
 /*   STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP  */
 
diff --git a/src/s_conf.c b/src/s_conf.c
index 7386c6665..c3536dc42 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -1342,6 +1342,11 @@ int	_conf_oper(ConfigFile *conf, ConfigEntry *ce)
 				cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
 			continue;
 		}
+		if (!strcmp(cep->ce_varname, "password"))
+		{
+			oper->auth = Auth_ConvertConf2AuthStruct(cep);
+			continue;
+		}
 		if (!cep->ce_entries)
 		{
 			/* standard variable */
@@ -1364,10 +1369,6 @@ int	_conf_oper(ConfigFile *conf, ConfigEntry *ce)
 						cep->ce_vardata);
 					oper->class = default_class;
 				}
-			} else
-			if (!strcmp(cep->ce_varname, "password"))
-			{
-				oper->auth = Auth_ConvertConf2AuthStruct(cep);
 			}
 			else if (!strcmp(cep->ce_varname, "swhois")) {
 				ircstrdup(oper->swhois, cep->ce_vardata);