From: hickert Date: Fri, 19 Feb 2010 09:03:34 +0000 (+0000) Subject: Updated base detection for incoming objects. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ba9c66eddb6d615b5415b808bd96dfc6d63372f;p=gosa.git Updated base detection for incoming objects. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15654 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc index 66ec3effd..d71cd3b42 100644 --- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc +++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc @@ -60,6 +60,8 @@ class wingeneric extends plugin $ui = get_userinfo(); $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn); $this->cn= ""; + } elseif(preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", $this->dn)){ + $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", "", $this->dn); } else { $this->base= preg_replace ("/^[^,]+,".preg_quote(get_winstations_ou(), '/')."/i", "", $this->dn); }