[Pkg-shadow-commits] sid/debian changelog,1.40,1.41 passwd.config,1.1,1.2 passwd.templates,1.1,1.2

[Martin Quinson]

Update of /cvsroot/pkg-shadow/sid/debian
In directory haydn:/tmp/cvs-serv16865

Modified Files:
	changelog passwd.config passwd.templates 
Log Message:
kill md5 question from passwd.templates since it is assumed true (and not asked) in the config since a whole while

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/changelog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- changelog	11 May 2005 11:22:28 -0000	1.40
+++ changelog	11 May 2005 11:32:52 -0000	1.41
@@ -5,6 +5,8 @@
       Closes: #283729
     - Enable login for GNU/Hurd in rules. First patch from Robert Millan.
       Closes: #249372
+    - Cleanup passwd debconf stuff as md5 passwords are assumed since
+      1:4.0.3-19 and the resolution of #223664.
   * Debian specific programs fixes:
     - NONE
   * Upstream bugs not fixed in upstream releases or CVS:

Index: passwd.templates
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/passwd.templates,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- passwd.templates	20 Mar 2005 14:48:28 -0000	1.1
+++ passwd.templates	11 May 2005 11:32:52 -0000	1.2
@@ -83,11 +83,3 @@
  that can only be read by special programs. The use of shadow passwords
  is strongly recommended. However, if you're going to use NIS you could
  run into trouble.
-
-Template: passwd/md5
-Type: boolean
-Default: false
-_Description: Enable md5 passwords?
- Md5 passwords are more secure and allow for passwords longer than 8
- characters to be used. However, they can cause compatibility problems if
- you are using NIS or sharing password files with older systems.

Index: passwd.config
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/passwd.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- passwd.config	20 Mar 2005 14:48:28 -0000	1.1
+++ passwd.config	11 May 2005 11:32:52 -0000	1.2
@@ -65,12 +65,7 @@
 	# This is very annoying. chpasswd cannot handle generating md5
 	# passwords as it is not PAM-aware. Thus, I have to work around
 	# that by crypting the password myself if md5 is used.
-#	db_get passwd/md5
-#	if [ "$RET" = true ]; then
-		USE_MD5=1
-#	else
-#		USE_MD5=''
-#	fi
+	USE_MD5=1
 	export USE_MD5
 	perl -e '
 		sub CreateCryptSalt {
@@ -110,28 +105,7 @@
 		db_input low passwd/shadow || true
 	;;
 	1)	
-# 		# Turn md5 passwords on/off now, so the two passwords set
-# 		# below can use it.
-# 		db_get passwd/md5
-# 		for file in /etc/pam.d/*; do
-# 			if [ -e $file ]; then
-# 				if [ "$RET" = true ]; then
-# 					# On.
-# 					if ! egrep -q "^password.*pam_(unix|ldap)\.so.*md5" $file ; then
-# 						sed 's/^\(password.*\)/\1 md5/' \
-# 							< $file > $file.new
-# 						mv -f $file.new $file
-# 					fi
-# 				else
-# 					# Off.
-# 					if egrep -q "^password.*pam_(unix|ldap)\.so.*md5" $file ; then
-# 						sed 's/^\(password.*\)md5/\1/' \
-# 							< $file > $file.new
-# 						mv -f $file.new $file
-# 					fi
-# 				fi
-# 			fi
-# 		done
+	# md5 passwords are now on by default. This step is dead.
 	:
 	;;
 	2)