From c386b918267067d7bd9eaaf2baf744e6ab16bacc Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Fri, 21 Apr 2017 18:57:35 +0200
Subject: [PATCH] Remove ldapjs from active-entry

---
 Packages/active-entry/lib/ActiveEntry.js | 1 +
 Packages/active-entry/package.js         | 1 -
 Packages/active-entry/server/methods.js  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/active-entry/lib/ActiveEntry.js b/Packages/active-entry/lib/ActiveEntry.js
index c306088d7..fadfb20ce 100755
--- a/Packages/active-entry/lib/ActiveEntry.js
+++ b/Packages/active-entry/lib/ActiveEntry.js
@@ -51,6 +51,7 @@ if (Meteor.isClient) {
 }
 
 if (Meteor.isServer) {
+  LDAP_DEFAULTS = {};
   LDAP_DEFAULTS.url = Meteor.settings.ldap && Meteor.settings.ldap.url;
   LDAP_DEFAULTS.port = Meteor.settings.ldap && Meteor.settings.ldap.port;
 }
diff --git a/Packages/active-entry/package.js b/Packages/active-entry/package.js
index 1feb8146a..fd7b5947b 100755
--- a/Packages/active-entry/package.js
+++ b/Packages/active-entry/package.js
@@ -26,7 +26,6 @@ Package.onUse(function (api) {
 
   api.use([
     'zuuk:stale-session@1.0.8',
-    'typ:accounts-ldap',
     'random'
   ], ['client', 'server']);
 
diff --git a/Packages/active-entry/server/methods.js b/Packages/active-entry/server/methods.js
index 64974e2ef..65d8dfc9a 100644
--- a/Packages/active-entry/server/methods.js
+++ b/Packages/active-entry/server/methods.js
@@ -154,7 +154,7 @@ Meteor.methods({
   },
 
   isLDAPSet: function() {
-    if (LDAP_DEFAULTS.url && LDAP_DEFAULTS.port) {
+    if (LDAP_DEFAULTS && LDAP_DEFAULTS.url && LDAP_DEFAULTS.port) {
       return true;
     }