Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms...

Peter Hormanns

2012-08-16 f0df8fb9a6b69b8cf2efed06d53aaa43df8d2e67

Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/

Conflicts:
	hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
	hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java

 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java

@@ -159,9 +159,9 @@

    private ShellProcessor createHiveEMailRemoveProcessor(String domName) {
        return new ShellProcessor(
            "postmap -d '" + domName + "' /etc/postfix/virtual && " + 
            "for KEY in $(postmap -s /etc/postfix/virtual|grep '@" + domName + "\\s'|cut -f1); " +
                "do postmap -d $KEY /etc/postfix/virtual; done"
            "postmap -d '" + domName + "' /etc/postfix-mailin/virtual && " + 
            "for KEY in $(postmap -s /etc/postfix-mailin/virtual|grep '@" + domName + "\\s'|cut -f1); " +
                "do postmap -d $KEY /etc/postfix-mailin/virtual; done"
            );
    }