From cb4fbc5689c33ef73ce24469391b0fa1418169f1 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 9 Feb 2015 11:58:08 +0100
Subject: [PATCH] Add a new EmailPrimaryDomain prop to user accounts To control
 how unqualified pseudonymes are created in LDAP

---
 root/etc/e-smith/events/actions/update-ldap-pseudonyms | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/etc/e-smith/events/actions/update-ldap-pseudonyms b/root/etc/e-smith/events/actions/update-ldap-pseudonyms
index 8fba291..a760a26 100644
--- a/root/etc/e-smith/events/actions/update-ldap-pseudonyms
+++ b/root/etc/e-smith/events/actions/update-ldap-pseudonyms
@@ -119,7 +119,7 @@ foreach my $acct (@accounts){
 
     my @alias = ();
     foreach (@pseudo){
-        $_ = $_ . "\@$domain" if $_ !~ /\@/;
+        $_ = $_ . "\@" . ($acct->prop('EmailPrimaryDomain') || $domain) if $_ !~ /\@/;
         push (@alias, unac_string(decode('utf-8',$_)));
     }
     @alias = uniq(@alias);