reverting the #1995 srvx merge until its a stable release. Commits after 1995 are...

[irc/evilnet/x3.git] / src / nickserv.h

diff --git a/src/nickserv.h b/src/nickserv.h
index 650227a62e2a087538678937150df7368a1d18fe..e59839a5e86df6f0e977ef891e3e303417315126 100644 (file)
--- a/src/nickserv.h
+++ b/src/nickserv.h
@@ -5,7 +5,7 @@
  *
  * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -185,8 +185,7 @@ struct nickserv_config {
     unsigned int force_handles_lowercase;
     unsigned int ldap_enable;
 #ifdef WITH_LDAP
-    const char *ldap_host;
-    unsigned int ldap_port;
+    const char *ldap_uri;
     const char *ldap_base;
     const char *ldap_dn_fmt;
     unsigned int ldap_version;
@@ -200,6 +199,7 @@ struct nickserv_config {
     struct string_list *ldap_object_classes;
     const char *ldap_oper_group_dn;
     const char *ldap_field_group_member;
+    unsigned int ldap_timeout;
 #endif
 };