From 8477e94d6c4536f3d04818bd0b8f9a70abb3383f Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 9 Jun 2006 04:54:01 +0000 Subject: [PATCH] Added conflict with kolab git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3723 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_goImapServer.inc | 4 ++-- plugins/admin/systems/class_goMailServer.inc | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc index cd4bf0578..c1571e64f 100644 --- a/plugins/admin/systems/class_goImapServer.inc +++ b/plugins/admin/systems/class_goImapServer.inc @@ -10,7 +10,6 @@ class goImapServer extends plugin{ var $objectclasses = array("goImapServer"); /* This class can't be assigned twice so it conflicts with itsself */ - var $conflicts = array("goImapServer"); var $DisplayName = ""; var $dn = NULL; @@ -40,7 +39,8 @@ class goImapServer extends plugin{ var $acl; - var $Actions = array(); + var $Actions = array(); + var $conflicts = array("goImapServer","kolab"); function goImapServer($config,$dn) { diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc index 1c0cdc17d..95fe64bd9 100644 --- a/plugins/admin/systems/class_goMailServer.inc +++ b/plugins/admin/systems/class_goMailServer.inc @@ -10,8 +10,6 @@ class goMailServer extends plugin{ var $objectclasses = array("goMailServer"); /* This class can't be assigned twice so it conflicts with itsself */ - var $conflicts = array("goMailServer"); - var $DisplayName = ""; var $dn = NULL; var $StatusFlag = "goMailServerStatus"; @@ -38,6 +36,7 @@ class goMailServer extends plugin{ var $TransportProtocols = array(); var $Actions = array(); var $cn = ""; + var $conflicts = array("goMailServer","kolab"); function goMailServer($config,$dn) { -- 2.30.2