Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble-scripts.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ziegler <diese-addy@funzt-halt.net>2012-07-15 19:09:58 +0400
committerMichael Ziegler <diese-addy@funzt-halt.net>2012-07-15 19:09:58 +0400
commit25568022db08b719ac77dc08b905480acbe2457b (patch)
treef739206b338b3a59e18659696aba549311e84fc4
parentf2dcb258631a08f36f38922683424477e49356c7 (diff)
apply changes from phpBB3auth.py to LDAPauth.py
-rw-r--r--Authenticators/LDAP/LDAPauth.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/Authenticators/LDAP/LDAPauth.py b/Authenticators/LDAP/LDAPauth.py
index 01b954d..fe2a516 100644
--- a/Authenticators/LDAP/LDAPauth.py
+++ b/Authenticators/LDAP/LDAPauth.py
@@ -170,7 +170,14 @@ group_attr = "uniqueMember"
import Ice
import sys
import ldap
-Ice.loadSlice("", ["-I " + slice_folder, slice_folder + "/Murmur.ice"])
+
+slicedir = Ice.getSliceDir()
+if not slicedir:
+ slicedir = ["-I/usr/share/Ice/slice", "-I/usr/share/slice"]
+else:
+ slicedir = ['-I' + slice_folder]
+
+Ice.loadSlice("", slicedir + [slice_folder + "/Murmur.ice"])
import Murmur
#The authenticator against LDAP