[evolvis-commits] r18702: univention pending merges:↵ Thorsten Glaser 2012-10-06 {CRYPT} in upper-case is valid in LDAP, too (thanks Natureshadow)

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Oct 8 12:14:50 CEST 2012


Author: mirabilos
Date: 2012-10-08 12:14:50 +0200 (Mon, 08 Oct 2012)
New Revision: 18702

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh
Log:
univention pending merges:
  Thorsten Glaser 2012-10-06 {CRYPT} in upper-case is valid in LDAP, too (thanks Natureshadow)

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-08 10:14:46 UTC (rev 18701)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-08 10:14:50 UTC (rev 18702)
@@ -1,8 +1,9 @@
 fusionforge (1:5.1.1+evolvis74) xunstable; urgency=low
 
   * Fix mailing list creation (semantic error in Perl script)
+  * Allow {CRYPT} in upper-case when importing LDAP users
 
- -- Thorsten Glaser <tg at mirbsd.de>  Sat, 06 Oct 2012 22:16:04 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Sat, 06 Oct 2012 22:28:54 +0200
 
 fusionforge (1:5.1.1+evolvis73) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh	2012-10-08 10:14:46 UTC (rev 18701)
+++ trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh	2012-10-08 10:14:50 UTC (rev 18702)
@@ -46,9 +46,9 @@
 
 [[ -z $2 || -z $3 || -z $4 || -z $5 || -z $6 || -z $7 ]] && out ignoring
 
-if [[ $userPassword = '{crypt}'* ]]; then
+if [[ $userPassword = '{'[Cc][Rr][Yy][Pp][Tt]'}'* ]]; then
 	# if LDAP uses {crypt} appease PAM
-	cryptpw=${userPassword#?crypt?}
+	cryptpw=${userPassword#???????}
 	vars="$vars cryptpw"
 	[[ $cryptpw = '!'* ]] && taction=2
 elif [[ $userPassword = '{'[Ss][Ss][Hh][Aa]'}'* ]]; then



More information about the evolvis-commits mailing list