X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0fdb2570901c40e19badddc9a17c82b66eac4487..91e46e62e5f9faf6735e0c41ce21113939cacb85:/src/s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index dc0474d..c93b57e 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -48,6 +48,7 @@
 #include "balloc.h"
 #include "event.h"
 #include "sprintf_irc.h"
+#include "irc_dictionary.h"
 
 dlink_list shared_conf_list;
 dlink_list cluster_conf_list;
@@ -330,6 +331,7 @@ static struct oper_flags oper_flagtable[] =
 	{ OPER_GLINE,		'G', 'g' },
 	{ OPER_KLINE,		'K', 'k' },
 	{ OPER_XLINE,		'X', 'x' },
+	{ OPER_RESV,		'Q', 'q' },
 	{ OPER_GLOBKILL,	'O', 'o' },
 	{ OPER_LOCKILL,		'C', 'c' },
 	{ OPER_REMOTE,		'R', 'r' },
@@ -744,13 +746,12 @@ get_nd_count(void)
 	return(dlink_list_length(&nd_list));
 }
 
-
 void
 add_nd_entry(const char *name)
 {
 	struct nd_entry *nd;
 
-	if(hash_find_nd(name) != NULL)
+	if(irc_dictionary_find(nd_dict, name) != NULL)
 		return;
 
 	nd = BlockHeapAlloc(nd_heap);
@@ -760,14 +761,16 @@ add_nd_entry(const char *name)
 
 	/* this list is ordered */
 	dlinkAddTail(nd, &nd->lnode, &nd_list);
-	add_to_nd_hash(name, nd);
+
+	irc_dictionary_add(nd_dict, nd->name, nd);
 }
 
 void
 free_nd_entry(struct nd_entry *nd)
 {
+	irc_dictionary_delete(nd_dict, nd->name);
+
 	dlinkDelete(&nd->lnode, &nd_list);
-	dlinkDelete(&nd->hnode, &ndTable[nd->hashv]);
 	BlockHeapFree(nd_heap, nd);
 }