* Saved missing value for goImapSieveServer

* Stripped unused entries from contributed demo.ldif

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

diff --git a/contrib/demo.ldif b/contrib/demo.ldif
index e2a7afe402c72f6a082ec0040921f38fe728a61d..232aee48e7743c244791bf460dd762f1d2ea46a6 100644 (file)
--- a/contrib/demo.ldif
+++ b/contrib/demo.ldif
@@ -12,46 +12,6 @@ sn: Upload user
 description: GOto Upload Benutzer
 userPassword:: e2tlcmJlcm9zfXRlcm1pbmFsYWRtaW5AR09OSUNVUy5MT0NBTAo=
 
-dn: ou=systems,dc=gonicus,dc=de
-objectClass: organizationalUnit
-ou: systems
-
-dn: ou=terminals,ou=systems,dc=gonicus,dc=de
-objectClass: organizationalUnit
-ou: terminals
-
-dn: ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: organizationalUnit
-ou: servers
-
-dn: ou=people,dc=gonicus,dc=de
-objectClass: organizationalUnit
-ou: people
-
-dn: ou=groups,dc=gonicus,dc=de
-objectClass: organizationalUnit
-ou: groups
-
-dn: cn=default,ou=terminals,ou=systems,dc=gonicus,dc=de
-objectClass: gotoTerminal
-cn: default
-gotoMode: disabled
-gotoXMethod: query
-gotoRootPasswd: tyogUVSVZlEPs
-gotoXResolution: 1024x768
-gotoXColordepth: 16
-gotoXKbModel: pc104
-gotoXKbLayout: de
-gotoXKbVariant: nodeadkeys
-gotoSyslogServer: lts-1
-gotoSwapServer: lts-1:/export/swap
-gotoLpdServer: lts-1:/export/spool
-gotoNtpServer: lts-1
-gotoScannerClients: lts-1.gonicus.local
-gotoFontPath: inet/lts-1:7110
-gotoXdmcpServer: lts-1
-gotoFilesystem: afs-1:/export/home /home nfs exec,dev,suid,rw,hard,nolock,fg,rsize=8192 1 1
-
 dn: cn=admin,ou=people,dc=gonicus,dc=de
 objectClass: person
 objectClass: organizationalPerson
@@ -74,58 +34,6 @@ cn: administrators
 gidNumber: 999
 memberUid: admin
 
-dn: cn=lts-1,ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: goTerminalServer
-objectClass: goServer
-goXdmcpIsEnabled: true
-macAddress: 00:B0:D0:F0:DE:1D
-cn: lts-1
-goFontPath: inet/lts-1:7110
-
-dn: cn=afs-1,ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: goNfsServer
-objectClass: goNtpServer
-objectClass: goLdapServer
-objectClass: goSyslogServer
-objectClass: goCupsServer
-objectClass: goServer
-macAddress: 00:B0:D0:F0:DE:1C
-cn: afs-1
-goExportEntry: /export/terminals 10.3.64.0/255.255.252.0(ro,async,no_root_squash)
-goExportEntry: /export/spool 10.3.64.0/255.255.252.0(rw,sync,no_root_squash)
-goExportEntry: /export/swap 10.3.64.0/255.255.252.0(rw,sync,no_root_squash)
-goExportEntry: /export/home 10.3.64.0/255.255.252.0(rw,sync,no_root_squash)
-goLdapBase: dc=gonicus,dc=de
-
-dn: cn=vserver-02,ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: goImapServer
-objectClass: goServer
-macAddress: 00:B0:D0:F0:DE:1F
-cn: vserver-02
-goImapName: imap://vserver-02.gonicus.local
-goImapConnect: {vserver-02.gonicus.local:143}
-goImapAdmin: cyrus
-goImapPassword: secret
-goImapSieveServer: vserver-02.gonicus.local
-goImapSievePort: 2000
-
-dn: cn=kerberos,ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: goKrbServer
-objectClass: goServer
-macAddress: 00:B0:D0:F0:DE:1E
-cn: kerberos
-goKrbRealm: GONICUS.LOCAL
-goKrbAdmin: admin/admin
-goKrbPassword: secret
-
-dn: cn=fax,ou=servers,ou=systems,dc=gonicus,dc=de
-objectClass: goFaxServer
-objectClass: goServer
-macAddress: 00:B0:D0:F0:DE:10
-cn: fax
-goFaxAdmin: fax
-goFaxPassword: secret
-
 dn: ou=incoming,dc=gonicus,dc=de
 objectClass: organizationalUnit
 ou: incoming

diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc
index f1aad2c6c99720daaa28a104f706ccff83ef8cf4..1d1ead982a070daf03d0375288d04869d6ae0208 100644 (file)
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -192,11 +192,12 @@ class servdb extends plugin
     foreach($this->objectclasses as $oc){
       $objectclasses[]= $oc;
     }
-  
+    
+    /* Move cn to sieve server */
+    $this->goImapSieveServer= $this->cn;
+    
     plugin::save();
   
-
-
     $test = $this->objectclasses;
     $tmp = array_flip($this->attrs['objectClass']);