X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FLDAPConnector.py;h=6a8d67a58559f7a5433cb8809b7a1c30790c2006;hb=0b9cd9d950c6abb7858d268b126608578592cb23;hp=1f35c207db250a25a66813dce9b76ea9ec0f5b18;hpb=07137a6ba9397180f6edb5b61a74bb6c18746811;p=uccvend-vendserver.git

diff --git a/sql-edition/servers/LDAPConnector.py b/sql-edition/servers/LDAPConnector.py
index 1f35c20..6a8d67a 100644
--- a/sql-edition/servers/LDAPConnector.py
+++ b/sql-edition/servers/LDAPConnector.py
@@ -12,12 +12,8 @@ def get_ldap_connection():
         #ldap.set_option(ldap.OPT_DEBUG_LEVEL,255)
         conn = ldap.initialize('ldaps://mussel.ucc.gu.uwa.edu.au:636/')
         
-        binddn = 'cn=admin,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au'
-        passfile = open('/etc/pam_ldap.secret')
-        password = passfile.readline().strip()
-        passfile.close()
-
-        conn.simple_bind_s(binddn, password)
+        # Anonymous bind - server ACLs should allow searching on uccDispenseMIFARE
+        conn.simple_bind_s()
         return conn
 
 def get_uid(card_id):
@@ -39,6 +35,8 @@ def get_uid(card_id):
 def set_card_id(uidNumber, card_id):
         ldapconn = get_ldap_connection()
         
+	# fix uidNumber for three/four digit uids
+	uidNumber = str(int(uidNumber))
         basedn = 'ou=People,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au'
         filter = ldap.filter.filter_format('(uidNumber=%s)', (uidNumber, ))
         attrs = ('objectClass', )