From 2f8c638c2688c4ea566065f70a48a56609218b81 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Wed, 7 Nov 2012 12:22:38 +0100
Subject: [PATCH] Fixes: #1477 suppress incoming and arpnew device
---
contrib/fusiondirectory.conf | 4 ----
contrib/man/fusiondirectory.conf.5 | 8 --------
include/functions.inc | 1 -
setup/class_setupStep_Migrate.inc | 2 +-
4 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index 39b9d823e..5ccbab4ec 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -103,10 +103,6 @@
every "tab" defined "class" and will show it inside of a tabbed dialog
with the header defined in "name".
-->
- <arpnewdevicetabs>
- <tab class="ArpNewDevice" name="Generic" />
- </arpnewdevicetabs>
-
<servertabs>
<tab class="ServerService" name="Services" />
</servertabs>
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index e48d65356..aaa57dad7 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -779,14 +779,6 @@ departments. Default is
.I ou=blocklists.
.PP
-.B systemIncomingRDN
-.I string
-.PP
-This statement defines the location where FusionDirectory looks for new systems to be joined to the LDAP.
-Default is
-.I ou=incoming.
-.PP
-
.B systemRDN
.I string
.PP
diff --git a/include/functions.inc b/include/functions.inc
index cfcaac3d4..2cfa523e5 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1574,7 +1574,6 @@ function get_ou($name)
"sambaMachineAccountRDN" => "ou=computers,",
"faxBlocklistRDN" => "ou=gofax,ou=systems,",
- "systemIncomingRDN" => "ou=incoming,",
"aclRoleRDN" => "ou=aclroles,",
"phoneMacroRDN" => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
"phoneConferenceRDN" => "ou=conferences,ou=asterisk,ou=configs,ou=systems,",
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 121abeae6..b1d91afe8 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -740,7 +740,7 @@ class Step_Migrate extends setup_step
/* Skip FusionDirectory internal departments */
$skip_dns = array("/".$cv['peopleou']."/","/".$cv['groupou']."/","/^ou=people,/","/^ou=groups,/","/^ou=sudoers,/",
"/(,|)ou=configs,/","/(,|)ou=systems,/","/(,|)ou=tokens,/",
- "/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/","/^ou=incoming,/",
+ "/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/",
"/ou=snapshots,/","/(,|)dc=addressbook,/","/^(,|)ou=machineaccounts,/",
"/(,|)ou=winstations,/","/^ou=hosts,/","/^ou=computers,/","/^ou=idmap,/","/^ou=Idmap,/","/(,|)ou=roles,/");
--
GitLab