hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

More fixes.

Browse Source
This commit is contained in:
Michael Hierweck 2017-09-15 19:49:04 +02:00
parent ff4af07450
commit 0cb44ebcc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
View File

@ -233,7 +233,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
if ("backupmxforexternalmx".equals(opt.getName())) { if ("backupmxforexternalmx".equals(opt.getName())) {
final Query query = em.createQuery( final Query query = em.createQuery(
"SELECT e FROM " + EMailAddress.class.getAnnotation(javax.persistence.Entity.class).name() "SELECT e FROM " + EMailAddress.class.getAnnotation(javax.persistence.Entity.class).name()
+ " e WHERE e.domain = :domname"); + " e WHERE e.domain.name = :domname");
query.setParameter("domname", updatedDom.getName()); query.setParameter("domname", updatedDom.getName());
if (!query.getResultList().isEmpty()) { if (!query.getResultList().isEmpty()) {
throw new HSAdminException( throw new HSAdminException(

2
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -209,7 +209,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
"." + dom.getName() + "\n")); "." + dom.getName() + "\n"));
mailQueueProcessor.appendProcessor(new ShellProcessor("postmap -d - /etc/postfix-mailin/relayrecipients || true", mailQueueProcessor.appendProcessor(new ShellProcessor("postmap -d - /etc/postfix-mailin/relayrecipients || true",
"@" + dom.getName() + "\n")); "@" + dom.getName() + "\n"));
mailQueueProcessor.appendProcessor(new ShellProcessor("postmap -d - /etc/postfix-mailin/transports || true", mailQueueProcessor.appendProcessor(new ShellProcessor("postmap -d - /etc/postfix-mailin/transport || true",
dom.getName() + "\n" + dom.getName() + "\n" +
"." + dom.getName() + "\n")); "." + dom.getName() + "\n"));
return mailQueueProcessor; return mailQueueProcessor;