--- a/ma	Wed Jul 19 19:38:54 2006 +0000
+++ b/ma	Wed Aug 02 12:02:18 2006 +0000
@@ -5,7 +5,7 @@
 # $Id$
 #
 use constant USAGE => <<'#';
-Usage: !ME! account|alias --add|--list|--modify|--delete [options] [user|alias|shared mbox]
+Usage: !ME! account|alias|group --add|--list|--modify|--delete [options] [user|alias|shared mbox]
        * common options *
        --ldap_server=s	LDAP-Server	[!$Cf->ldap_server!]
        --ldap_base=s	LDAP-Basis	[!$Cf->ldap_base!]
@@ -61,70 +61,6 @@
 use ldapBase;
 
 use constant ME => basename $0;
-use constant CONFIG => (
-    { CASE => 1 },
-    GLOBAL => { DEFAULT => undef },
-
-    # * common *
-    add =>	    { ARGS => "!",  ALIAS => [qw/new create/] },
-    list =>	    { ARGS => "!",  ALIAS => "ls" },
-    modify =>	    { ARGS => "!",  ALIAS => "change" },
-    delete =>	    { ARGS => "!",  ALIAS => "remove" },
-
-    ldap_base =>    { ARGS => "=s", DEFAULT => ldapBase(qw(/etc/openldap/ldap.conf /etc/ldap/ldap.conf)) },
-    ldap_server =>  { ARGS => "=s", DEFAULT => "localhost" },
-    ldap_bind_dn => { ARGS => "=s", DEFAULT => "cn=admin", ALIAS => "ldap_admin" },
-    ldap_password =>{ ARGS => "=s" },
-
-    help =>	    { ARGS => "!" },
-    debug =>	    { ARGS => "!" },
-
-    description =>  { ARGS => "=s" },
-
-
-    # * account *
-    imap_server =>  { ARGS => "=s", DEFAULT => "localhost" },
-    imap_admin =>   { ARGS => "=s", DEFAULT => $ENV{USER} },
-    imap_password =>{ ARGS => "=s" },
-    imap_quota =>   { ARGS => "=i", DEFAULT => 300, ALIAS => "quota" },
-
-    mbox =>	    { ARGS => "!",  DEFAULT => 1 },
-    password =>	    { ARGS => "=s" },
-#   internal =>	    { ARGS => "!",  DEFAULT => ":", ALIAS => "restricted" },	    
-
-    other =>	    { ARGS => ":s" },
-    group =>	    { ARGS => ":s" },
-    forward =>	    { ARGS => ":s" },
-    fullname =>	    { ARGS => "=s", ALIAS => "realname" },
-    address =>	    { ARGS => "=s", ALIAS => "primary" },
-
-    # * alias * group *
-    members =>	    { ARGS => ":s" },
-
-    # * shared *
-    #access =>	    { ARGS => ":s" },
-
-    # * group *
-    gid_min =>	    { ARGS => "=i", DEFAULT => 60000 },
-    gid_max =>	    { ARGS => "=i", DEFAULT => 60100 },
-
-    # * ldap intern *
-    ldap_ou_aliases =>	    { ARGS => "=s", DEFAULT => "ou=MailAliases" },
-    ldap_ou_accounts =>	    { ARGS => "=s", DEFAULT => "ou=MailAccounts" },
-    ldap_ou_groups =>	    { ARGS => "=s", DEFAULT => "ou=Groups" },
-
-    ldap_oc_alias =>	    { ARGS => "=s", DEFAULT => "XXXmailAlias" },
-    ldap_oc_recipient =>    { ARGS => "=s", DEFAULT => "XXXmailRecipient" },
-    ldap_oc_accessgroup =>  { ARGS => "=s", DEFAULT => "XXXmailAccessGroup" },
-
-    ldap_at_address =>	    { ARGS => "=s", DEFAULT => "XXXmailAddress" },
-    ldap_at_group =>	    { ARGS => "=s", DEFAULT => "XXXmailGroup" },
-    ldap_at_forwardingaddress =>
-			    { ARGS => "=s", DEFAULT => "XXXmailForwardingAddress" },
-    ldap_at_primaryaddress => 
-			    { ARGS => "=s", DEFAULT => "XXXmailPrimaryAddress" },
-
-);
 our $Cf;
 
 sub help();
@@ -138,7 +74,7 @@
 
 MAIN: {
 
-    $Cf = new AppConfig CONFIG or die;
+    $Cf = new AppConfig Common::CONFIG or die;
 
     if (exists $ENV{MA_CONF} and -f $ENV{MA_CONF}) {
 	my $f = $ENV{MA_CONF};