Message,
FLAG_MOD_ADD,
FLAG_MOD_REPLACE
- )
+)
from samba.dcerpc import drsuapi, misc
from samba.drs_utils import drs_DsBind
from samba import dsdb
req8.destination_dsa_guid = misc.GUID(dest_dsa) if dest_dsa else misc.GUID()
req8.source_dsa_invocation_id = misc.GUID(invocation_id)
req8.naming_context = drsuapi.DsReplicaObjectIdentifier()
- req8.naming_context.dn = unicode(nc_dn_str)
+ req8.naming_context.dn = str(nc_dn_str)
req8.highwatermark = drsuapi.DsReplicaHighWaterMark()
req8.highwatermark.tmp_highest_usn = 0
req8.highwatermark.reserved_usn = 0
"cn": class_name,
"lDAPDisplayName": class_ldn,
"governsId": "1.3.6.1.4.1.7165.4.6.2.5." \
- + str((100000 * base_int) + random.randint(1,100000)) + ".1.5.13",
+ + str((100000 * base_int) + random.randint(1,100000)) + ".1.5.13",
"instanceType": "4",
"objectClassCategory": "%d" % oc_cat,
"subClassOf": "top",
"systemOnly": "FALSE"}
# allow overriding/adding attributes
- if not attrs is None:
+ if attrs is not None:
rec.update(attrs)
# add it to the Schema
try:
"cn": attr_name,
"lDAPDisplayName": attr_ldn,
"attributeId": "1.3.6.1.4.1.7165.4.6.1.5." \
- + str((100000 * base_int) + random.randint(1,100000)) + ".1.5.13",
+ + str((100000 * base_int) + random.randint(1,100000)) + ".1.5.13",
"attributeSyntax": "2.5.5.12",
"omSyntax": "64",
"instanceType": "4",
"isSingleValued": "TRUE",
"systemOnly": "FALSE"}
# allow overriding/adding attributes
- if not attrs is None:
+ if attrs is not None:
rec.update(attrs)
# add it to the Schema
ldb_ctx.add(rec)