--- a/ma Thu Dec 08 21:23:58 2011 +0100
+++ b/ma Sat Dec 10 20:36:56 2011 +0100
@@ -5,10 +5,10 @@
# $Id$
#
use constant USAGE => <<'#';
-Usage: !ME! account|alias|group --add|--list|--modify|--delete [options] [user|alias|shared mbox]
+Usage: !ME! account|alias|group|acl --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!]
+ --ldap_base=s LDAP-Base [!$Cf->ldap_base!]
--ldap_admin=s LDAP BIND DN [!$Cf->ldap_admin!]
--ldap_password=s [!$Cf->ldap_password!]
@@ -28,20 +28,27 @@
--forward:s Forwarding [!$Cf->forward!]
--fullname=s Real Name [!$Cf->fullname!]
- --password=s Passwort [!$Cf->password!]
+ --password=s Password [!$Cf->password!]
+
+ * acl options *
+ --acl_admin=s ACL Admin [!$Cf->acl_admin!]
+ --acl_password=s Pasword [!$Cf->acl_admin!]
+ --folder:s@ Folder(s) [!join ',', @{$Cf->folder}!]
+ --acl=s ACL list [!$Cf->acl!]
+ --[no]recursive Rekursive [!$Cf->recursive!]
* alias options *
--members=s List of Members [!$Cf->members!]
* shared mailbox options *
- [ z.Z. nicht unterstützt ]
+ [ currently not supported ]
* group options *
--members=s List of Members [!$Cf->members!]
--description=s Descripton [!$Cf->description!]
- [ z.Z. nicht unterstützt ]
+ [ currently not supported ]
Passwords for LDAP and IMAP can be read from environment LDAP_PASS resp. IMAP_PASS.
Options can be read from config file named in $MA_CONF [!$ENV{MA_CONF}!].
@@ -98,7 +105,7 @@
exit 0;
}
- @_ = grep { $_ =~ /^\Q$Module\E/ } qw/account alias shared group/;
+ @_ = grep { $_ =~ /^\Q$Module\E/ } qw/account acl alias shared group/;
die "Need module. Try --help\n" if @_ == 0;
die "Module ambigous. (@_)\n" if @_ > 1;
@@ -106,6 +113,10 @@
require account;
account::import($Cf);
account::run();
+ } elsif ( $_[0] eq 'acl' ) {
+ require acl;
+ acl::import($Cf);
+ acl::run();
} elsif ( $_[0] eq 'alias' ) {
require alias;
alias::import($Cf);