[evolvis-commits] r7569: Remove double cvsGroup, code cleanup↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:43:45 CET 2011


Author: mirabilos
Date: 2011-02-24 15:43:45 +0100 (Thu, 24 Feb 2011)
New Revision: 7569

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/utils/sql2ldif.pl
Log:
Remove double cvsGroup, code cleanup


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/utils/sql2ldif.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/utils/sql2ldif.pl	2011-02-24 14:43:43 UTC (rev 7568)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/utils/sql2ldif.pl	2011-02-24 14:43:45 UTC (rev 7569)
@@ -49,8 +49,8 @@
 	print "uid: $username\n";
 	if (!$realname) { $realname='?'; }
 	$realname=~tr#\x80-\xff#?#;  # it should be UTF-8 encoded, we just drop non-ascii chars
-	print "cn: $realname\n";
-	print "objectClass: account
+	print "cn: $realname
+objectClass: account
 objectClass: posixAccount
 objectClass: top
 objectClass: shadowAccount
@@ -165,8 +165,8 @@
 SELECT user_name
 FROM users,user_group
 WHERE group_id=$gid
-      AND users.user_id=user_group.user_id
-      AND user_group.cvs_flags > 0
+AND users.user_id=user_group.user_id
+AND user_group.cvs_flags > 0
 ";
 	my $rel = $dbh->prepare($query);
 	$rel->execute();
@@ -174,6 +174,7 @@
 	#CB from 2.6# virtual member for anoncvs access
 	$uid=$gid+$anoncvs_uid_add;
 	$gid += $gid_add;
+
 	print "\ndn: uid=anoncvs_$groupname,ou=People,$sys_ldap_base_dn
 uid: anoncvs_$groupname
 cn: anoncvs
@@ -194,22 +195,20 @@
 gecos: anoncvs
 ";
 
-
 	#CB# To have the same id than generated by new_parse
 	#CB# CVS group itself
-	$gid += $gid_add;
-	print "\ndn: cn=$groupname,ou=cvsGroup,$sys_ldap_base_dn
-objectClass: posixGroup
-objectClass: top
-cn: $groupname
-userPassword: {crypt}x
-gidNumber: $gid
-";
-
-	while(my ($username) = $rel->fetchrow()) {
-		print "memberUid: $username\n";
-	}
-	print "\n";
+#DUP#	print "\ndn: cn=$groupname,ou=cvsGroup,$sys_ldap_base_dn
+#DUP#objectClass: posixGroup
+#DUP#objectClass: top
+#DUP#cn: $groupname
+#DUP#userPassword: {crypt}x
+#DUP#gidNumber: $gid
+#DUP#";
+#DUP#
+#DUP#	while(my ($username) = $rel->fetchrow()) {
+#DUP#		print "memberUid: $username\n";
+#DUP#	}
+#DUP#	print "\n";
 }
 
 #



More information about the evolvis-commits mailing list