[Pkg-shadow-commits] r503 - in branches/experimental/debian: . patches

Wed Aug 31 23:34:16 UTC 2005

Author: nekral-guest
Date: 2005-08-31 23:34:16 +0000 (Wed, 31 Aug 2005)
New Revision: 503

Added:
   branches/experimental/debian/patches/447_missing_login.defs_variables
Modified:
   branches/experimental/debian/login.defs
   branches/experimental/debian/patches/series
Log:
After verification of the list of login.defs variables really used by the
Debian shadow utilities, update the getdef.c and login.def files.


Modified: branches/experimental/debian/login.defs
===================================================================

--- branches/experimental/debian/login.defs	2005-08-31 18:46:00 UTC (rev 502)
+++ branches/experimental/debian/login.defs	2005-08-31 23:34:16 UTC (rev 503)
@@ -16,9 +16,6 @@
 #   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
 #   MAIL_DIR takes precedence.
 #
-#   QMAIL_DIR is for Qmail (or any maildir-compatible MTA, such as Exim or
-#   Postfix when suitably configured).
-# 
 #   Essentially:
 #      - MAIL_DIR defines the $MAIL environmental variable
 #        (for mbox use) by appending the username to MAIL_DIR as defined
@@ -26,9 +23,6 @@
 #      - MAIL_FILE defines the $MAIL environment variable as the
 #        fully-qualified filename obtained by prepending the user home
 #        directory before $MAIL_FILE
-#      - QMAIL_DIR defines the MAILDIR environment variable as the 
-#        fully-qualified directory name obtained by prepending the user 
-#        home directory before $QMAIL_DIR.
 #
 # NOTE: This is used to setup your MAIL environment variable, and also
 # used by userdel to determine if any mail spools need to be removed when
@@ -37,7 +31,6 @@
 # have mail" message on login, and, in default setup, overrides this setting
 # in determining the $MAIL environmental variable.
 # 
-#QMAIL_DIR      Maildir/
 MAIL_DIR        /var/mail
 #MAIL_FILE      .mail
 
@@ -140,11 +133,8 @@
 #	ERASECHAR	Terminal ERASE character ('\010' = backspace).
 #	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
 #	UMASK		Default "umask" value.
-#	ULIMIT		Default "ulimit" value.
 #
 # The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
 # 
 # UMASK usage is discouraged because it catches only some classes of user
 # entries to system, in fact only those made through login(1), while setting
@@ -269,7 +259,41 @@
 #
 # FAKE_SHELL /bin/fakeshell
 
+#
+# If defined, either full pathname of a file containing device names or
+# a ":" delimited list of device names.  Root logins will be allowed only
+# upon these devices.
+#
+# This variable is used by login and su.
+#
+#CONSOLE	/etc/consoles
+#CONSOLE	console:tty01:tty02:tty03:tty04
 
+#
+# List of groups to add to the user's supplementary group set
+# when logging in on the console (as determined by the CONSOLE
+# setting).  Default is none.
+#
+# Use with caution - it is possible for users to gain permanent
+# access to these groups, even when not logged in on the console.
+# How to do it is left as an exercise for the reader...
+#
+# This variable is used by login and su.
+#
+#CONSOLE_GROUPS		floppy:audio:cdrom
+
+#
+# Only works if compiled with MD5_CRYPT defined:
+# If set to "yes", new passwords will be encrypted using the MD5-based
+# algorithm compatible with the one used by recent releases of FreeBSD.
+# It supports passwords of unlimited length and longer salt strings.
+# Set to "no" if you need to copy encrypted passwords to other systems
+# which don't understand the new algorithm.  Default is "no".
+#
+# This variable is used by chpasswd, gpasswd and newusers.
+#
+#MD5_CRYPT_ENAB	no
+
 ################# OBSOLETED BY PAM ##############
 #						#
 # These options are now handled by PAM. Please	#
@@ -284,13 +308,10 @@
 #MAIL_CHECK_ENAB
 #OBSCURE_CHECKS_ENAB
 #PORTTIME_CHECKS_ENAB
-#CONSOLE
 #SU_WHEEL_ONLY
 #CRACKLIB_DICTPATH
 #PASS_CHANGE_TRIES
 #PASS_ALWAYS_WARN
-#MD5_CRYPT_ENAB
-#CONSOLE_GROUPS
 #ENVIRON_FILE
 #NOLOGINS_FILE
 #ISSUE_FILE
@@ -310,6 +331,7 @@
 # CLOSE_SESSIONS
 # LOGIN_STRING
 # NO_PASSWORD_CONSOLE
+# QMAIL_DIR
 
 
 

Added: branches/experimental/debian/patches/447_missing_login.defs_variables
===================================================================
--- branches/experimental/debian/patches/447_missing_login.defs_variables	2005-08-31 18:46:00 UTC (rev 502)
+++ branches/experimental/debian/patches/447_missing_login.defs_variables	2005-08-31 23:34:16 UTC (rev 503)
@@ -0,0 +1,31 @@
+Goal: get the right set of variables in the getdef table.
+MAIL_FILE is used in userdel and usermod.
+
+MD5_CRYPT_ENAB is used by crypt_make_salt, which is used by chpasswd,
+               gpasswd and newusers
+
+Status wrt upstream: submitted
+
+
+Index: shadow-4.0.12/lib/getdef.c
+===================================================================
+--- shadow-4.0.12.orig/lib/getdef.c	2005-09-01 00:24:54.000000000 +0200
++++ shadow-4.0.12/lib/getdef.c	2005-09-01 00:34:21.000000000 +0200
+@@ -69,6 +69,8 @@
+ 	{"LOG_OK_LOGINS", NULL},
+ 	{"LOG_UNKFAIL_ENAB", NULL},
+ 	{"MAIL_DIR", NULL},
++	{"MAIL_FILE", NULL},
++	{"MD5_CRYPT_ENAB", NULL},
+ 	{"PASS_MAX_DAYS", NULL},
+ 	{"PASS_MIN_DAYS", NULL},
+ 	{"PASS_WARN_AGE", NULL},
+@@ -93,8 +95,6 @@
+ 	{"LASTLOG_ENAB", NULL},
+ 	{"LOGIN_STRING", NULL},
+ 	{"MAIL_CHECK_ENAB", NULL},
+-	{"MAIL_FILE", NULL},
+-	{"MD5_CRYPT_ENAB", NULL},
+ 	{"MOTD_FILE", NULL},
+ 	{"NOLOGINS_FILE", NULL},
+ 	{"OBSCURE_CHECKS_ENAB", NULL},

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-31 18:46:00 UTC (rev 502)
+++ branches/experimental/debian/patches/series	2005-08-31 23:34:16 UTC (rev 503)
@@ -108,6 +108,7 @@
 365_PAM_copy_environ_later
 445_su_password_expired
 446_newgrp.1_no_SHADOWPWD
+447_missing_login.defs_variables
 #207_id-manpages
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future


