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

Collapse All | Expand All

(-)doc/errata/staging/univention-ldap.yaml (-1 / +1 lines)
 Lines 7-13   fix: 16.0.7-8A~5.0.0.202112071104 Link Here 
7 
desc: |
 7 
desc: |
8 
 This update addresses the following issue:
 8 
 This update addresses the following issue:
9 
 * On the Primary the LDAP server module `refint` can now be enabled by
 9 
 * On the Primary the LDAP server module `refint` can now be enabled by
10 
   setting the UCR variable `ldap/refint=true`. It enforces referential
 10 
   setting the UCR variable `ldap/overlay/refint=true`. It enforces referential
11 
   integrity for the attribute `uniqueMember`. For updates the module will not
 11 
   integrity for the attribute `uniqueMember`. For updates the module will not
12 
   be enabled by default.
 12 
   be enabled by default.
13 
bug: [54185]
 13 
bug: [54185]
(-)management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/31modules (-1 / +1 lines)
 Lines 17-23   if configRegistry.is_true('ldap/shadowbind', True): Link Here 
17 
	print('moduleload\tshadowbind.so')
 17 
	print('moduleload\tshadowbind.so')
18 
if configRegistry.is_true('ldap/overlay/lastbind', False):
 18 
if configRegistry.is_true('ldap/overlay/lastbind', False):
19 
	print('moduleload\tlastbind.la')
 19 
	print('moduleload\tlastbind.la')
20 
if configRegistry.is_true('ldap/refint', True) and configRegistry.get('server/role') == 'domaincontroller_master':
 20 
if configRegistry.is_true('ldap/overlay/refint', True) and configRegistry.get('server/role') == 'domaincontroller_master':
21 
	print('moduleload\trefint.so')
 21 
	print('moduleload\trefint.so')
22 
if configRegistry.is_true('ldap/pw-bcrypt', False):
 22 
if configRegistry.is_true('ldap/pw-bcrypt', False):
23 
	print('moduleload\tpw-bcrypt.so')
 23 
	print('moduleload\tpw-bcrypt.so')
(-)management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/40univention-ldap-server_database (-2 / +2 lines)
 Lines 17-25   if configRegistry.get('ldap/database/type') == "mdb" and configRegistry.is_true( Link Here 
17 
	if configRegistry.is_true('ldap/ppolicy/enabled', False):
 17 
	if configRegistry.is_true('ldap/ppolicy/enabled', False):
18 
		ppolicy_default = 'cn=default,cn=ppolicy,cn=univention,%(ldap/base)s' % configRegistry
 18 
		ppolicy_default = 'cn=default,cn=ppolicy,cn=univention,%(ldap/base)s' % configRegistry
19 
		print('ppolicy_default\t"%s"' % configRegistry.get('ldap/ppolicy/default', ppolicy_default))
 19 
		print('ppolicy_default\t"%s"' % configRegistry.get('ldap/ppolicy/default', ppolicy_default))
20 
if configRegistry.is_true('ldap/refint', True) and configRegistry.get('server/role') == 'domaincontroller_master':
 20 
if configRegistry.is_true('ldap/overlay/refint', True) and configRegistry.get('server/role') == 'domaincontroller_master':
21 
	print('overlay\t\trefint')
 21 
	print('overlay\t\trefint')
22 
	print('refint_attributes\t\tuniqueMember')
 22 
	print('refint_attributes\t\t%s' % (configRegistry.get('ldap/overlay/refint/attributes', 'uniqueMember'),))
23 
if configRegistry.is_true('ldap/shadowbind', True):
 23 
if configRegistry.is_true('ldap/shadowbind', True):
24 
	print('overlay\t\tshadowbind')
 24 
	print('overlay\t\tshadowbind')
25 
	if 'ldap/shadowbind/ignorefilter' in configRegistry:
 25 
	if 'ldap/shadowbind/ignorefilter' in configRegistry:
(-)management/univention-ldap/debian/univention-ldap-server.postinst (-3 / +4 lines)
 Lines 116-124   if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 13.0.3-5; Link Here 
116 
	ucr set ldap/shadowbind=false
 116 
	ucr set ldap/shadowbind=false
117 
fi
 117 
fi
118 

          118
          

        

          
            

              119
              
# set ldap/refint to false for updates


              119
              
# set ldap/overlay/refint to false for updates

            

        

          120
          
if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 16.0.7-7; then

          120
          
if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 16.0.7-7; then

        

          
            

              121
              
	ucr set ldap/refint=false


              121
              
	ucr set ldap/overlay/refint=false

            

        

          122
          
fi

          122
          
fi

        

        

          123
          

          123
          

        

        

          124
          
ucr set \

          124
          
ucr set \

        

  

    

    

       Lines 148-154
      ucr set \ 
    
  Link Here 
    

  

        

          148
          
	slapd/backup?true \

          148
          
	slapd/backup?true \

        

        

          149
          
	ldap/shadowbind?true \

          149
          
	ldap/shadowbind?true \

        

        

          150
          
	ldap/shadowbind/ignorefilter?"(|(objectClass=univentionDomainController)(userPassword={KINIT}))" \

          150
          
	ldap/shadowbind/ignorefilter?"(|(objectClass=univentionDomainController)(userPassword={KINIT}))" \

        

          
            

              151
              
	ldap/refint?true \


              151
              
	ldap/overlay/refint?true \

            

            

              
              

              152
              
	ldap/overlay/refint/attributes?uniqueMember \

            

        

          152
          
	ldap/maxopenfiles?8192 # Bug #17705

          153
          
	ldap/maxopenfiles?8192 # Bug #17705

        

        

          153
          

          154
          

        

        

          154
          
if [ "$1" = "configure" -a -z "$2" ]; then

          155
          
if [ "$1" = "configure" -a -z "$2" ]; then

        



(-)management/univention-ldap/debian/univention-ldap-server.univention-config-registry
      (-2 / +3 lines)




  

    

    

       Lines 78-84
      Variables: ldap/ppolicy 
    
  Link Here 
    

  

        

          78
          
Variables: ldap/shadowbind

          78
          
Variables: ldap/shadowbind

        

        

          79
          
Variables: ldap/overlay/lastbind

          79
          
Variables: ldap/overlay/lastbind

        

        

          80
          
Variables: ldap/pw-bcrypt

          80
          
Variables: ldap/pw-bcrypt

        

          
            

              81
              
Variables: ldap/refint


              81
              
Variables: ldap/overlay/refint

            

        

          82
          
Variables: server/role

          82
          
Variables: server/role

        

        

          83
          

          83
          

        

        

          84
          
Type: subfile

          84
          
Type: subfile

        

  

    

    

       Lines 118-124
      Variables: ldap/shadowbind 
    
  Link Here 
    

  

        

          118
          
Variables: ldap/shadowbind/ignorefilter

          118
          
Variables: ldap/shadowbind/ignorefilter

        

        

          119
          
Variables: ldap/overlay/lastbind

          119
          
Variables: ldap/overlay/lastbind

        

        

          120
          
Variables: ldap/overlay/lastbind/precision

          120
          
Variables: ldap/overlay/lastbind/precision

        

          
            

              121
              
Variables: ldap/refint


              121
              
Variables: ldap/overlay/refint

            

            

              
              

              122
              
Variables: ldap/overlay/refint/attributes

            

        

          122
          
Variables: server/role

          123
          
Variables: server/role

        

        

          123
          

          124
          

        

        

          124
          
Type: subfile

          125
          
Type: subfile

        



(-)management/univention-ldap/debian/univention-ldap-server.univention-config-registry-variables
      (-1 / +7 lines)




  

    

    

       Lines 282-293
      Description[en]=The precision in seconds defines whether the 'lastbind' overlay 
    
  Link Here 
    

  

        

          282
          
Type=str

          282
          
Type=str

        

        

          283
          
Categories=service-ldap

          283
          
Categories=service-ldap

        

        

          284
          

          284
          

        

          
            

              285
              
[ldap/refint]


              285
              
[ldap/overlay/refint]

            

        

          286
          
Description[de]=Bestimmt, ob das Modul refint geladen werden soll. Es erzwingt referentielle Integrität im Attribut uniqueMember. Wird nur auf dem DC Master ausgewertet.

          286
          
Description[de]=Bestimmt, ob das Modul refint geladen werden soll. Es erzwingt referentielle Integrität im Attribut uniqueMember. Wird nur auf dem DC Master ausgewertet.

        

        

          287
          
Description[en]=Whether or not the refint overlay should be enabled. It enforces referential integrity for the attribute uniqueMember. Only applies to the DC Master.

          287
          
Description[en]=Whether or not the refint overlay should be enabled. It enforces referential integrity for the attribute uniqueMember. Only applies to the DC Master.

        

        

          288
          
Type=bool

          288
          
Type=bool

        

        

          289
          
Categories=service-ldap

          289
          
Categories=service-ldap

        

        

          290
          

          290
          

        

            

              
              
              291
              
[ldap/overlay/refint/attributes]

            

            

              292
              
Description[de]=Bestimmt, die Attribute für das refint Modul (Leerzeichen separiert) (Standard: uniqueMember).

            

            

              293
              
Description[en]=Defines the attributes for the refint module (space separated) (default: uniqueMember).

            

            

              294
              
Type=str

            

            

              295
              
Categories=service-ldap

            

            

              296
              

            

        

          291
          
[ldap/attributeoptions]

          297
          
[ldap/attributeoptions]

        

        

          292
          
Description[de]=Definiert Tagging-Attributoptionen oder Options-Tags/Range-Präfixe (siehe man slapd.conf).

          298
          
Description[de]=Definiert Tagging-Attributoptionen oder Options-Tags/Range-Präfixe (siehe man slapd.conf).

        

        

          293
          
Description[en]=Define tagging attribute options or option tag/range prefixes (see man slapd.conf).

          299
          
Description[en]=Define tagging attribute options or option tag/range prefixes (see man slapd.conf).

        



(-)test/ucs-test/tests/01_base/52proofuniquemember
      (-3 / +3 lines)




  

    

    

       Lines 18-28
      group="$(random_chars)" 
    
  Link Here 
    

  

        

          18
          

          18
          

        

        

          19
          
info "Create group and a member for it"

          19
          
info "Create group and a member for it"

        

        

          20
          

          20
          

        

          
            

              21
              
old="$(ucr get ldap/refint)"


              21
              
old="$(ucr get ldap/overlay/refint)"

            

            

              22
              
ucr set ldap/refint=false


              22
              
ucr set ldap/overlay/refint=false

            

        

          23
          
service slapd restart

          23
          
service slapd restart

        

        

          24
          
trap '

          24
          
trap '

        

          
            

              25
              
ucr set ldap/refint="$old"


              25
              
ucr set ldap/overlay/refint="$old"

            

        

          26
          
service slapd restart

          26
          
service slapd restart

        

        

          27
          
' INT TERM EXIT

          27
          
' INT TERM EXIT

        

        

          28
          

          28
          

        






  

  Return to bug 48956