Merge pull request #173 from NethServer/bug-7789

DavidePrincipi · web-flow · commit abd38525ace5 · 2025-12-11T19:39:17.000+01:00
Fix export-users DOMAIN key error Refs NethServer/dev#7789
diff --git a/imageroot/actions/import-module/50import_configuration b/imageroot/actions/import-module/50import_configuration
@@ -26,3 +26,4 @@ for evar in [
 
 agent.set_env('SERVER_ROLE', 'dc')
 agent.set_env('NBALIAS', '')
+agent.set_env('DOMAIN', ienv['REALM'].lower())
diff --git a/imageroot/pypkg/samba.py b/imageroot/pypkg/samba.py
@@ -291,7 +291,7 @@ def get_ad_ldap_suffix() -> str:
     """Returns the LDAP base DN suffix derived from the DOMAIN environment variable.
     For example, if DOMAIN is 'ad.example.com', returns 'DC=ad,DC=example,DC=com'.
     """
-    parts = os.environ["DOMAIN"].split(".")
+    parts = os.getenv('DOMAIN', os.environ['REALM'].lower()).split(".")
     return "DC=" + ",DC=".join(parts)
 
 def export_users() -> list:

Original file line number	Diff line number	Diff line change
`@@ -26,3 +26,4 @@ for evar in [`
`26`	`26`
`27`	`27`	`agent.set_env('SERVER_ROLE', 'dc')`
`28`	`28`	`agent.set_env('NBALIAS', '')`
	`29`	`+agent.set_env('DOMAIN', ienv['REALM'].lower())`