From 771ac02902638f68b567e59dbae7bb3a1bef8f88 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 23 Nov 2010 08:48:04 +0000 Subject: [PATCH] Updated ARP dependencies! If ArpNewDevice wasn t avaiable, some plugins were broken. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20336 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc index 49ce7b073..a585d0d03 100644 --- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc +++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc @@ -59,7 +59,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("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $this->dn)){ + } elseif(class_available("ArpNewDevice") && + preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $this->dn)){ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", "", $this->dn); } else { $this->base= preg_replace ("/^[^,]+,".preg_quote(get_winstations_ou(), '/')."/i", "", $this->dn); -- 2.30.2