more python work. Not safe to run yet

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

diff --git a/src/nickserv.h b/src/nickserv.h
index 3e74eef922a4f361a5ec534c4fbcef46373ae13b..aca3b211644f39daaadeee7f31a654d907ad7025 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,
@@ -182,13 +182,26 @@ struct nickserv_config {
     const char *auto_admin;
     char default_style;
     struct string_list *denied_fakehost_words;
+    unsigned int force_handles_lowercase;
     unsigned int ldap_enable;
-    const char *ldap_host;
-    unsigned int ldap_port;
+#ifdef WITH_LDAP
+    const char *ldap_uri;
     const char *ldap_base;
     const char *ldap_dn_fmt;
     unsigned int ldap_version;
     unsigned int ldap_autocreate;
+
+    const char *ldap_admin_dn;
+    const char *ldap_admin_pass;
+    const char *ldap_field_account;
+    const char *ldap_field_password;
+    const char *ldap_field_email;
+    struct string_list *ldap_object_classes;
+    const char *ldap_oper_group_dn;
+    unsigned int ldap_oper_group_level;
+    const char *ldap_field_group_member;
+    unsigned int ldap_timeout;
+#endif
 };
 
 void init_nickserv(const char *nick);
@@ -203,7 +216,7 @@ int oper_has_access(struct userNode *user, struct userNode *bot, unsigned int mi
 void nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd);
 
 struct handle_info *get_victim_oper(struct svccmd *cmd, struct userNode *user, const char *target);
-struct handle_info *loc_auth(char *handle, char *password);
+struct handle_info *loc_auth(char *handle, char *password, char *userhost);
 
 typedef void (*user_mode_func_t)(struct userNode *user, const char *mode_change);
 void reg_user_mode_func(user_mode_func_t func);