From be78fefa58777613f1b208a199dd86514cd9b75d Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 14 May 2007 11:59:41 +0000 Subject: [PATCH] Fixed schema git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6366 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/openldap/goserver.schema | 4 ++-- plugins/personal/connectivity/class_kolabAccount.inc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema index fa36ff763..ce845f04f 100644 --- a/contrib/openldap/goserver.schema +++ b/contrib/openldap/goserver.schema @@ -443,13 +443,13 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.79 NAME 'goLogDB' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) -attributetype ( 1.3.6.1.4.1.10098.1.1.9.80 NAME 'goLogDBUser' +attributetype ( 1.3.6.1.4.1.10098.1.1.9.80 NAME 'goLogDBServerUser' DESC 'Auth user for logging DB' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) -attributetype ( 1.3.6.1.4.1.10098.1.1.9.81 NAME 'goLogDBPassword' +attributetype ( 1.3.6.1.4.1.10098.1.1.9.81 NAME 'goLogDBServerPassword' DESC 'Password for logging DB user' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc index 0b09fdc51..469bddd17 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -278,6 +278,10 @@ class kolabAccount extends plugin function remove_from_parent() { + if(!$this->initially_was_account){ + return; + } + /* Optionally execute a command after we're done */ plugin::remove_from_parent(); -- 2.30.2