# HG changeset patch
# User heiko
# Date 1155854318 0
# Node ID 72ba031fec206463e4c30c8dc608252201798969
# Parent  4d73e4ea84cd4c1f0ae3d809b2b27fc9da2d5b52
Default-Domain für primary-Address

diff -r 4d73e4ea84cd -r 72ba031fec20 Common.pm
--- a/Common.pm	Wed Aug 09 07:57:14 2006 +0000
+++ b/Common.pm	Thu Aug 17 22:38:38 2006 +0000
@@ -26,6 +26,7 @@
 
 
     # * account *
+    default_domain => { ARGS => "=s", DEFAULT => "" },
     imap_server =>  { ARGS => "=s", DEFAULT => "localhost" },
     imap_admin =>   { ARGS => "=s", DEFAULT => $ENV{USER} },
     imap_password =>{ ARGS => "=s" },
diff -r 4d73e4ea84cd -r 72ba031fec20 account.pm
--- a/account.pm	Wed Aug 09 07:57:14 2006 +0000
+++ b/account.pm	Thu Aug 17 22:38:38 2006 +0000
@@ -95,6 +95,10 @@
     my $mailForwardingAddress = [split /,/, $Cf->forward || ""];
     my $pw = _mkpw($Cf->password || "{pwgen}");
 
+    if ($mailPrimaryAddress !~ /@/) {
+	$mailPrimaryAddress .= "@" . $Cf->default_domain;
+    }
+
 
     my $dn = "uid=$user,$ubase";
     my $r;
diff -r 4d73e4ea84cd -r 72ba031fec20 ma
--- a/ma	Wed Aug 09 07:57:14 2006 +0000
+++ b/ma	Thu Aug 17 22:38:38 2006 +0000
@@ -17,6 +17,7 @@
        --imap_password=s		[!$Cf->imap_password!]
 
        * account options *
+       --default_domain	Default Domain  [!$Cf->default_domain!]
        --[no]mbox	Create MBox	[!$Cf->mbox!]
        --imap_quota=i	Mail Quota (MB) [!$Cf->imap_quota!]
        --address=s	Primary Mail	[!$Cf->address!]
diff -r 4d73e4ea84cd -r 72ba031fec20 ma.conf.ex
--- a/ma.conf.ex	Wed Aug 09 07:57:14 2006 +0000
+++ b/ma.conf.ex	Thu Aug 17 22:38:38 2006 +0000
@@ -2,6 +2,9 @@
 # MA_CONF den Filenamen dieses Files enthalten.
 # $Id$
 # $URL$
+
+default_domain = MY.SITE
+
 [ldap]
 password = SECRET