kevinveenbirkenbach/ldapsm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized Schema replace logic and updated exit codes

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-06-27 14:44:11 +02:00
parent 10f703537a
commit 9b249c531c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.py
View File

@@ -166,6 +166,7 @@ def main():
print(f"➕ Added AttributeType: {atdef}") print(f"➕ Added AttributeType: {atdef}")
except ldap.LDAPError as e: except ldap.LDAPError as e:
print(f"❌ LDAP error for AttributeType '{atdef}': {e}", file=sys.stderr) print(f"❌ LDAP error for AttributeType '{atdef}': {e}", file=sys.stderr)
sys.exit(1)
# Add/update ObjectClasses # Add/update ObjectClasses
for ocdef in args.object_class: for ocdef in args.object_class:
@@ -175,11 +176,17 @@ def main():
attrlist=['olcObjectClasses']) attrlist=['olcObjectClasses'])
existing = result[0][1].get('olcObjectClasses', []) existing = result[0][1].get('olcObjectClasses', [])
if encoded in existing: if encoded in existing:
print(f"ℹ️ ObjectClass already exists, replacing: {ocdef}") print(f"ℹ️ ObjectClass already exists, replacing (DELETE + ADD): {ocdef}")
conn.modify_s(schema_dn, [ mods = [
(ldap.MOD_REPLACE, 'olcObjectClasses', [encoded]) (ldap.MOD_DELETE, 'olcObjectClasses', [encoded]),
]) (ldap.MOD_ADD, 'olcObjectClasses', [encoded])
print(f"🔄 Replaced ObjectClass: {ocdef}") ]
try:
conn.modify_s(schema_dn, mods)
print(f"🔄 Replaced ObjectClass: {ocdef}")
except ldap.LDAPError as e:
print(f"❌ LDAP error replacing ObjectClass '{ocdef}': {e}")
sys.exit(2)
else: else:
conn.modify_s(schema_dn, [ conn.modify_s(schema_dn, [
(ldap.MOD_ADD, 'olcObjectClasses', [encoded]) (ldap.MOD_ADD, 'olcObjectClasses', [encoded])
@@ -187,6 +194,7 @@ def main():
print(f"➕ Added ObjectClass: {ocdef}") print(f"➕ Added ObjectClass: {ocdef}")
except ldap.LDAPError as e: except ldap.LDAPError as e:
print(f"❌ LDAP error for ObjectClass '{ocdef}': {e}", file=sys.stderr) print(f"❌ LDAP error for ObjectClass '{ocdef}': {e}", file=sys.stderr)
sys.exit(3)
conn.unbind_s() conn.unbind_s()