From: Rubin <redacted>
Date: Sun, 7 Aug 2016 21:25:07 +0000 (-0700)
Subject: Merge branch 'master' of github.com:evilnet/x3
X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/685ca706f0bb315360e1c60f92af91aa83a6389f?hp=ec83f5e4c13ecada2f4e54c343705882a986c383

Merge branch 'master' of github.com:evilnet/x3
---

diff --git a/src/nickserv.c b/src/nickserv.c
index ee3ebdc..c3ef1d5 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -5327,8 +5327,9 @@ nickserv_conf_read(void)
     if(nickserv_conf.ldap_enable > 0) {
         /* ldap is enabled but not compiled in - error out */
         log_module(MAIN_LOG, LOG_ERROR, "ldap is enabled in config, but not compiled in!");
-        nickserv_conf.ldap_enable = 0;
-        sleep(5);
+        exit(2);
+        /* nickserv_conf.ldap_enable = 0; */
+        /* sleep(5); */
     }
 #endif 
 
diff --git a/src/x3ldap.c b/src/x3ldap.c
index e352d79..931ea52 100644
--- a/src/x3ldap.c
+++ b/src/x3ldap.c
@@ -17,6 +17,13 @@
  * along with srvx; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  *
+ * 
+ * INSTRUCTIONS:
+ *   * Setup an ldap server. Add inetOrgAnon to the schema (it is in tools/ldap)
+ *   * Make sure ldap is enabled at compile time (debian needs libldap2-dev package)
+ *   * Enable ldap in x3.conf and set everything
+ *   * Initial import: you can use the secret authserv search action add2ldap
+ *     to get your users into ldap. /msg authserv search add2ldap account *
  *
  * TODO:
  *   * get queries working in static existance, so i understand how it works