Updating gosa package in squeeze

[Cajus Pollmeier <pollmeier@gonicus.de>]

Hello release team,

I got a bug (1) for the GOsa package, that prevents GOsa from removing a host 
from the DHCP configuration if it gets removed. Is it possible to get the 
attached patch for 2.6.11-4 into a future stable update release?

Thanks,
Cajus

(1) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650258

diff -Naur debian.orig/changelog debian/changelog
--- debian.orig/changelog	2010-12-05 13:28:44.000000000 +0100
+++ debian/changelog	2011-11-30 09:56:19.000000000 +0100
@@ -1,3 +1,10 @@
+gosa (2.6.11-4) unstable; urgency=low
+
+  * Fixes an issue where hosts do not get removed from
+    the DHCP information if they're deleted (Closes: #650258)
+
+ -- Cajus Pollmeier <cajus@debian.org>  Wed, 30 Nov 2011 09:55:11 +0100
+
 gosa (2.6.11-3) unstable; urgency=low
 
   * Don't install gosa-core/contrib/desktoprc to /etc/gosa/desktoprc of
diff -Naur debian.orig/patches/12_fix_missing_dhcp_host_removal.patch debian/patches/12_fix_missing_dhcp_host_removal.patch
--- debian.orig/patches/12_fix_missing_dhcp_host_removal.patch	1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/12_fix_missing_dhcp_host_removal.patch	2011-11-30 09:54:49.000000000 +0100
@@ -0,0 +1,48 @@
+--- a/systems/admin/systems/class_termDNS.inc
++++ b/systems/admin/systems/class_termDNS.inc
+@@ -471,9 +471,15 @@
+ 
+   function remove_from_parent()
+   {
++
++    $ldap = $this->config->get_ldap_link();
++
++    /************
++     * DNS Handling
++     ************/
++
+     if($this->DNS_is_account){
+ 
+-      $ldap = $this->config->get_ldap_link();
+ 
+       $tmp = array();
+       $this->dnsEntry['exists'] = false;
+@@ -489,6 +495,19 @@
+         }
+       }
+     }
++
++
++    /************
++     * DHCP Handling 
++     ************/
++
++    /* DHCP removed */
++    if($this->dhcp_is_Account){
++      $ldap->rmdir_recursive($this->dhcpHostEntry['dn']);
++      if (!$ldap->success()){
++        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dhcpHostEntry['dn'], LDAP_DEL, get_class()));
++      }
++    }
+   }
+ 
+ 
+@@ -786,7 +805,7 @@
+           ($this->dhcpHostEntry['dhcpStatements'] == "" || count($this->dhcpHostEntry['dhcpStatements']) == 0) ){
+         unset($this->dhcpHostEntry['dhcpStatements']);
+       }
+-  
++
+       /* DHCP removed */
+       if($this->initial_dhcp_is_Account && !$this->dhcp_is_Account){
+         $ldap->rmdir_recursive($this->dhcpHostEntry['dn']);
diff -Naur debian.orig/patches/series debian/patches/series
--- debian.orig/patches/series	2010-12-05 13:17:27.000000000 +0100
+++ debian/patches/series	2011-11-30 09:45:28.000000000 +0100
@@ -9,3 +9,4 @@
 09_typo_cvs_template.patch
 10_dep_filter_sub.patch
 11_dep_filter_sub_xml.patch
+12_fix_missing_dhcp_host_removal.patch

Attachment: signature.asc
Description: This is a digitally signed message part.