View | Details | Raw Unified | Return to bug 50305
Collapse All | Expand All

(-)a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py (-3 / +1 lines)
 Lines 195-203   s4_mapping = { Link Here 
195 
			univention.s4connector.set_primary_group_user,
 195 
			univention.s4connector.set_primary_group_user,
196 
			univention.s4connector.s4.sid_mapping.sid_to_ucs if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
 196 
			univention.s4connector.s4.sid_mapping.sid_to_ucs if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
197 
		]),
 197 
		]),
198 
		post_con_create_functions=[
 198 
		con_create_attributes=[('userAccountControl', ['512'])],
199 
			univention.s4connector.s4.normalise_userAccountControl,
200 
		],
201 
		post_con_modify_functions=filter(None, [
 199 
		post_con_modify_functions=filter(None, [
202 
			univention.s4connector.s4.sid_mapping.sid_to_s4 if configRegistry.is_true('connector/s4/mapping/sid_to_s4', False) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
 200 
			univention.s4connector.s4.sid_mapping.sid_to_s4 if configRegistry.is_true('connector/s4/mapping/sid_to_s4', False) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
203 
			univention.s4connector.s4.password.password_sync_ucs_to_s4,
 201 
			univention.s4connector.s4.password.password_sync_ucs_to_s4,
(-)a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py (+2 lines)
 Lines 41-46   import sys Link Here 
41 
import time
 41 
import time
42 
import types
 42 
import types
43 
import pprint
 43 
import pprint
44 
import warnings
44 

          45
          

        

        

          45
          
import ldap

          46
          
import ldap

        

        

          46
          
from ldap.controls import LDAPControl

          47
          
from ldap.controls import LDAPControl

        

  

    

    

       Lines 67-72
      PAGE_SIZE = 1000 
    
  Link Here 
    

  

        

          67
          

          68
          

        

        

          68
          

          69
          

        

        

          69
          
def normalise_userAccountControl(s4connector, key, object):

          70
          
def normalise_userAccountControl(s4connector, key, object):

        

            

              
              
              71
              
	warnings.warn('The function normalise_userAccountControl() is deprecated and should not be used in the mapping anymore. Use con_create_attributes instead.')

            

        

          70
          
	# set userAccountControl to 512 -- accounts synced to samba4 alpha17 had userAccountControl == 544

          72
          
	# set userAccountControl to 512 -- accounts synced to samba4 alpha17 had userAccountControl == 544

        

        

          71
          
	ud.debug(ud.LDAP, ud.ALL, "normalise_userAccountControl: dn: %s" % object['dn'])

          73
          
	ud.debug(ud.LDAP, ud.ALL, "normalise_userAccountControl: dn: %s" % object['dn'])

        

        

          72
          
	for i in range(0, 10):

          74
          
	for i in range(0, 10):

        






  

  Return to bug 50305