|
Lines 363-369
def samaccountname_dn_mapping(connector,
|
Link Here
|
|---|
|
|---|
| 363 |
|
363 |
|
| 364 |
else: |
364 |
else: |
| 365 |
newdn_rdn = [('cn', fst_rdn_value, ldap.AVA_STRING)] |
365 |
newdn_rdn = [('cn', fst_rdn_value, ldap.AVA_STRING)] |
| 366 |
newdn = ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]) # new object, don't need to change |
366 |
default_dn = connector.property[propertyname].con_default_dn |
|
|
367 |
newdn = ldap.dn.dn2str([newdn_rdn] + ldap.dn.str2dn(default_dn)) # new object, don't need to change |
| 367 |
|
368 |
|
| 368 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn: %s" % newdn) |
369 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn: %s" % newdn) |
| 369 |
else: |
370 |
else: |
|
Lines 415-421
def samaccountname_dn_mapping(connector,
|
Link Here
|
|---|
|
|---|
| 415 |
newdn_rdn = [(dn_attr, dn_attr_val, ldap.AVA_STRING)] # guess the old dn |
416 |
newdn_rdn = [(dn_attr, dn_attr_val, ldap.AVA_STRING)] # guess the old dn |
| 416 |
else: |
417 |
else: |
| 417 |
newdn_rdn = [(ucsattrib, samaccountname, ldap.AVA_STRING)] # guess the old dn |
418 |
newdn_rdn = [(ucsattrib, samaccountname, ldap.AVA_STRING)] # guess the old dn |
| 418 |
newdn = ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]) |
419 |
default_dn = connector.property[propertyname].ucs_default_dn |
|
|
420 |
newdn = ldap.dn.dn2str([newdn_rdn] + ldap.dn.str2dn(default_dn)) |
| 419 |
try: |
421 |
try: |
| 420 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn for key %s:" % dn_key) |
422 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn for key %s:" % dn_key) |
| 421 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: olddn: %s" % dn) |
423 |
ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: olddn: %s" % dn) |