Fixed schema

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6366 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema
index fa36ff7635331f99ef76246c52803c9964a6c807..ce845f04fb2d6aa644401aacd985af3ddd32d981 100644 (file)
--- 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 0b09fdc51c1136b1d1bc682f653c08c9e18702ba..469bddd17999afde77d4d00e6ec0788c160d0075 100644 (file)
--- 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();