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

Collapse All | Expand All

(-)a/base/univention-lib/python/misc.py (-1 / +2 lines)
 Lines 32-37   Univention Common Python Library Link Here 
32 

          32
          

        

        

          33
          
import univention.config_registry

          33
          
import univention.config_registry

        

        

          34
          
import subprocess

          34
          
import subprocess

        

            

              
              
              35
              
from urllib import quote

            

        

          35
          

          36
          

        

        

          36
          

          37
          

        

        

          37
          
def createMachinePassword():

          38
          
def createMachinePassword():

        

  

    

    

       Lines 80-86
      def getLDAPURIs(configRegistryInstance=None): 
    
  Link Here 
    

  

        

          80
          
	if ldap_server_addition:

          81
          
	if ldap_server_addition:

        

        

          81
          
		ldaphosts.extend(ldap_server_addition.split())

          82
          
		ldaphosts.extend(ldap_server_addition.split())

        

        

          82
          
	if ldaphosts:

          83
          
	if ldaphosts:

        

          
            

              83
              
		urilist = ["ldap://%s:%s" % (host, port) for host in ldaphosts]


              84
              
		urilist = ["ldap://%s:%s" % (quote(host), quote(port)) for host in ldaphosts]

            

        

          84
          
		uri_string = ' '.join(urilist)

          85
          
		uri_string = ' '.join(urilist)

        

        

          85
          

          86
          

        

        

          86
          
	return uri_string

          87
          
	return uri_string

        



(-)a/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master
      (-1 / +2 lines)




  

    

    

       Lines 1-5
       
    
  Link Here 
    

  

        

          1
          
@!@

          1
          
@!@

        

        

          2
          
from univention.lib.misc import custom_username, custom_groupname

          2
          
from univention.lib.misc import custom_username, custom_groupname

        

            

              
              
              3
              
from urllib import quote

            

        

          3
          

          4
          

        

        

          4
          
ldap_base = configRegistry['ldap/base']

          5
          
ldap_base = configRegistry['ldap/base']

        

        

          5
          
ldap_port = configRegistry['slapd/port']

          6
          
ldap_port = configRegistry['slapd/port']

        

  

    

    

       Lines 10-16
      users_default_administrator = custom_username('Administrator') 
    
  Link Here 
    

  

        

          10
          

          11
          

        

        

          11
          
print 'authz-regexp'

          12
          
print 'authz-regexp'

        

        

          12
          
print '    uid=([^,]*),cn=(gssapi|saml),cn=auth'

          13
          
print '    uid=([^,]*),cn=(gssapi|saml),cn=auth'

        

          
            

              13
              
print '    ldap:///%s??sub?uid=$1' % (ldap_base,)


              14
              
print '    ldap:///%s??sub?uid=$1' % (quote(ldap_base),)

            

        

          14
          
print

          15
          
print

        

        

          15
          

          16
          

        

        

          16
          
print 'access to attrs=uid value=root by * none stop'

          17
          
print 'access to attrs=uid value=root by * none stop'

        



(-)a/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave
      (-1 / +4 lines)




  

    

    

       Lines 1-6
       
    
  Link Here 
    

  

        

          1
          
authz-regexp

          1
          
authz-regexp

        

        

          2
          
    uid=([^,]*),cn=(gssapi|saml),cn=auth

          2
          
    uid=([^,]*),cn=(gssapi|saml),cn=auth

        

          
            

              3
              
    ldap:///@%@ldap/base@%@??sub?uid=$1


              3
              
@!@

            

            

              
              

              4
              
from urllib import quote

            

            


              5
              
print '\tldap:///%s??sub?uid=$1' % (quote(configRegistry['ldap/base']),)

            

            


              6
              
@!@

            

        

          4
          

          7
          

        

        

          5
          
# allow authentication

          8
          
# allow authentication

        

        

          6
          
access to attrs=userPassword

          9
          
access to attrs=userPassword

        






  

  Return to bug 39345