View | Details | Raw Unified | Return to bug 40816 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-2 / +2 lines)
 Lines 699-706    Link Here 
699
			tls_mode = 0
758
			tls_mode = 0
700
759
701
		## Determine ad_ldap_base with exact case
760
		## Determine ad_ldap_base with exact case
761
		ldaps = self.baseConfig.is_true('%s/ad/ldap/ldaps' % self.CONFIGBASENAME, False) # tls or ssl
702
		try:
762
		try:
703
			self.lo_ad=univention.uldap.access(host=self.ad_ldap_host, port=int(self.ad_ldap_port), base='', binddn=None, bindpw=None, start_tls=tls_mode, use_ldaps = ldaps, ca_certfile=self.ad_ldap_cer)
763
			self.lo_ad=univention.uldap.access(host=self.ad_ldap_host, port=int(self.ad_ldap_port), base='', binddn=None, bindpw=None, start_tls=tls_mode, use_ldaps = ldaps, ca_certfile=self.ad_ldap_certificate)
704
			self.ad_ldap_base = self.lo_ad.lo.search_ext_s('', ldap.SCOPE_BASE,
764
			self.ad_ldap_base = self.lo_ad.lo.search_ext_s('', ldap.SCOPE_BASE,
705
									'objectclass=*', ['defaultNamingContext'],
765
									'objectclass=*', ['defaultNamingContext'],
706
									timeout=-1, sizelimit=0)[0][1]['defaultNamingContext'][0]
766
									timeout=-1, sizelimit=0)[0][1]['defaultNamingContext'][0]
 Lines 707-713    Link Here 
707
		except Exception:
767
		except Exception:
708
			ud.debug(ud.LDAP, ud.ERROR, 'Failed to lookup AD LDAP base, using UCR value.')
768
			ud.debug(ud.LDAP, ud.ERROR, 'Failed to lookup AD LDAP base, using UCR value.')
709
769
710
		ldaps = self.baseConfig.is_true('%s/ad/ldap/ldaps' % self.CONFIGBASENAME, False) # tls or ssl
711
770
712
		if self.baseConfig.is_true('%s/ad/ldap/kerberos' % self.CONFIGBASENAME):
771
		if self.baseConfig.is_true('%s/ad/ldap/kerberos' % self.CONFIGBASENAME):
713
			os.environ['KRB5CCNAME']='/var/cache/univention-ad-connector/krb5.cc'
772
			os.environ['KRB5CCNAME']='/var/cache/univention-ad-connector/krb5.cc'

Return to bug 40816