From e6fc5db2e1cbcd0db849baf7e9fdea0d1aec02e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 22 May 2017 17:24:49 +0200
Subject: [PATCH] Fixes #5538 Fixed migration of winstations and samba users
 without confusion between those

---
 contrib/bin/fusiondirectory-setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index b976cfa7d..899efd54f 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1190,6 +1190,7 @@ sub migrate_users {
           '(objectClass=person)'.
           '(objectClass=OpenLDAPperson)'.
         ')'.
+        '(!(objectClass=ipHost))'.
         '(!(objectClass=inetOrgPerson))'.
         '(uid=*)'.
       ')',
@@ -1464,7 +1465,7 @@ sub migrate_winstations
   my $ldap = $hash_ldap_param{ldap};
 
   my $mesg = $ldap->search(
-    filter => "(&(!(objectClass=fdWorkstation))(objectClass=sambaSamAccount))",
+    filter => "(&(!(objectClass=fdWorkstation))(!(objectClass=inetOrgPerson))(!(objectClass=posixGroup))(uid=*\$)(objectClass=sambaSamAccount))",
     base   => $base
   );
   $mesg->code && die $mesg->error;
-- 
GitLab