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

Collapse All | Expand All

(-)a/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master (-2 / +2 lines)
 Lines 11-19   else: Link Here 
11 
groups_default_domainadmins = custom_groupname('Domain Admins')
 11 
groups_default_domainadmins = custom_groupname('Domain Admins')
12 
users_default_administrator = custom_username('Administrator')
 12 
users_default_administrator = custom_username('Administrator')
13 

          13
          

        

          
            

              14
              
print 'sasl-regexp'


              14
              
print 'authz-regexp'

            

        

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

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

        

          
            

              16
              
print '    ldap://0.0.0.0:%s/"%s"??sub?uid=$1' % (ldap_port, ldap_base)


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

            

        

          17
          
print

          17
          
print

        

        

          18
          

          18
          

        

        

          19
          
print 'access to attrs=userPassword'

          19
          
print 'access to attrs=userPassword'

        



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




  

    

    

       Lines 1-6
       
    
  Link Here 
    

  

          
            

              1
              
sasl-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
              
    ldap:///@%@ldap/base@%@??sub?uid=$1

            

        

          4
          

          4
          

        

        

          5
          
# allow authentication 

          5
          
# allow authentication 

        

        

          6
          
access to attrs=userPassword

          6
          
access to attrs=userPassword

        

  

    

    

       Lines 31-36
      if baseConfig.is_false('ldap/acl/read/anonymous'): 
    
  Link Here 
    

  

        

          31
          
else:

          31
          
else:

        

        

          32
          
	print '   by * read'

          32
          
	print '   by * read'

        

        

          33
          
print

          33
          
print

        

            

              
              
              34
              
if configRegistry.is_false('ldap/acl/read/anonymous'):

            

            

              35
              
	print 'access to attrs=entry,uid'

            

            

              36
              
	print '   by anonymous auth'

            

        

          34
          

          37
          

        

        

          35
          
if configRegistry.get('ldap/replog', '').lower() in ('true', 'yes'):

          38
          
if configRegistry.get('ldap/replog', '').lower() in ('true', 'yes'):

        

        

          36
          
	print "replogfile /var/lib/univention-ldap/replog/replog"

          39
          
	print "replogfile /var/lib/univention-ldap/replog/replog"

        



(-)a/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end
      (+4 lines)




  

    

    

       Lines 179-184
      if configRegistry.is_false('ldap/acl/read/anonymous'): 
    
  Link Here 
    

  

        

          179
          
else:

          179
          
else:

        

        

          180
          
	print '   by * read'

          180
          
	print '   by * read'

        

        

          181
          

          181
          

        

            

              
              
              182
              
if configRegistry.is_false('ldap/acl/read/anonymous'):

            

            

              183
              
	print 'access to attrs=entry,uid'

            

            

              184
              
	print '   by anonymous auth'

            

            

              185
              

            

        

          182
          
if configRegistry.is_true('ldap/replog', False):

          186
          
if configRegistry.is_true('ldap/replog', False):

        

        

          183
          
	print "replogfile /var/lib/univention-ldap/replog/replog"

          187
          
	print "replogfile /var/lib/univention-ldap/replog/replog"

        

        

          184
          
@!@

          188
          
@!@

        






  

  Return to bug 29482