From 7445f29213a63b8469bff2b10ebdfc4f8d1c2154 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 2 Jul 2020 18:14:02 +0200
Subject: [PATCH] added inetUser as ObjectClass for the users

---
 .../java/org/gcube/portal/ldapexport/LDAPSync.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java b/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java
index 6ac298e..4591572 100644
--- a/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java
+++ b/src/main/java/org/gcube/portal/ldapexport/LDAPSync.java
@@ -102,12 +102,10 @@ public class LDAPSync implements Runnable {
 			DirContext ctx = new InitialDirContext(env);
 			_log.debug("Initiating LDAP Sync ...");
 			createUsersOrganizationalUnit(ctx);
-
-			//crate or update the whole list of organizations (objectClass=organizationalUnit, ou="+orgName+",dc=d4science,dc=org) and groups ( objectClass=top and POSIXGroup)
-
-			updateGroups(ctx, rootVO);
-			//and update the users list
+			//update the users list
 			exportSingleUsers(ctx, env, users);
+			//crate or update the whole list of organizations (objectClass=organizationalUnit, ou="+orgName+",dc=d4science,dc=org) and groups ( objectClass=top and POSIXGroup)
+			updateGroups(ctx, rootVO);
 		} catch (NamingException e) {
 			_log.error("Something went Wrong during LDAP Sync in Exporting to LDAP");
 			e.printStackTrace();
@@ -175,7 +173,8 @@ public class LDAPSync implements Runnable {
 				//update the list of users in such VRE
 				updateUsersInGroup(ctx, vreSubCtx, vre);
 			}
-		}			
+		}
+		_log.debug("LDAP Groups Sync Completed OK!");
 	}
 	/**
 	 * 
@@ -268,7 +267,7 @@ public class LDAPSync implements Runnable {
 		objectClass.add("top");
 		objectClass.add("groupofnames");
 		objectClass.add("posixGroup");
-		objectClass.add("nestedGroup");
+		//objectClass.add("nestedGroup");
 		attributes.put(objectClass);
 
 		Attribute cn = new BasicAttribute("cn");
@@ -370,6 +369,7 @@ public class LDAPSync implements Runnable {
 		objectClass.add("posixAccount");
 		objectClass.add("organizationalPerson");
 		objectClass.add("person");
+		objectClass.add("inetUser");
 		objectClass.add("shadowAccount");
 		objectClass.add("ldapPublicKey");		
 		attributes.put(objectClass);