diff --git a/COPYING b/COPYING
index 4070441..513503a 100644
--- a/COPYING
+++ b/COPYING
@@ -71,73 +71,3 @@ License: GPL-3+-with-additional-terms-1
ACTION, LAWSUITS, JUDGMENTS EXPENSES (INCLUDING WITHOUT LIMITATION REASONABLE
ATTORNEYS' FEES AND EXPENSES) OR ANY OTHER LIABILITY ARISING FROM, RELATED TO OR
IN CONNECTION WITH YOUR ASSUMPTIONS OF LIABILITY.
- .
-
-Files: etc/login.defs.security-misc
-Copyright:
- This is Debian GNU/Linux's prepackaged version of the shadow utilities.
- .
- It was downloaded from: .
- As of May 2007, this site is no longer available.
- .
- Copyright:
- .
- Parts of this software are copyright 1988 - 1994, Julianne Frances Haugh.
- All rights reserved.
- .
- Parts of this software are copyright 1997 - 2001, Marek Michałkiewicz.
- All rights reserved.
- .
- Parts of this software are copyright 2001 - 2004, Andrzej Krzysztofowicz
- All rights reserved.
- .
- Parts of this software are copyright 2000 - 2007, Tomasz Kłoczko.
- All rights reserved.
-License: shadow-license
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of Julianne F. Haugh nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- .
- This source code is currently archived on ftp.uu.net in the
- comp.sources.misc portion of the USENET archives. You may also contact
- the author, Julianne F. Haugh, at jockgrrl@ix.netcom.com if you have
- any questions regarding this package.
- .
- THIS SOFTWARE IS BEING DISTRIBUTED AS-IS. THE AUTHORS DISCLAIM ALL
- LIABILITY FOR ANY CONSEQUENCES OF USE. THE USER IS SOLELY RESPONSIBLE
- FOR THE MAINTENANCE OF THIS SOFTWARE PACKAGE. THE AUTHORS ARE UNDER NO
- OBLIGATION TO PROVIDE MODIFICATIONS OR IMPROVEMENTS. THE USER IS
- ENCOURAGED TO TAKE ANY AND ALL STEPS NEEDED TO PROTECT AGAINST ACCIDENTAL
- LOSS OF INFORMATION OR MACHINE RESOURCES.
- .
- Special thanks are due to Chip Rosenthal for his fine testing efforts;
- to Steve Simmons for his work in porting this code to BSD; and to Bill
- Kennedy for his contributions of LaserJet printer time and energies.
- Also, thanks for Dennis L. Mumaugh for the initial shadow password
- information and to Tony Walton (olapw@olgb1.oliv.co.uk) for the System
- V Release 4 changes. Effort in porting to SunOS has been contributed
- by Dr. Michael Newberry (miken@cs.adfa.oz.au) and Micheal J. Miller, Jr.
- (mke@kaberd.rain.com). Effort in porting to AT&T UNIX System V Release
- 4 has been provided by Andrew Herbert (andrew@werple.pub.uu.oz.au).
- Special thanks to Marek Michalkiewicz (marekm@i17linuxb.ists.pwr.wroc.pl)
- for taking over the Linux port of this software.
diff --git a/debian/control b/debian/control
index 5e11ff0..d6e2546 100644
--- a/debian/control
+++ b/debian/control
@@ -148,21 +148,6 @@ Description: enhances misc security settings
* /usr/lib/security-misc/pam-abort-on-locked-password
.
access rights restrictions:
- .
- * The default umask is changed to 027. This allows only the owner and group
- to read and write to newly created files.
- /etc/login.defs.security-misc
- /usr/share/pam-configs/usergroups-security-misc
- /etc/sudoers.d/umask-security-misc
- .
- * Enables pam_umask.so usergroups so group permissions are same as user
- permissions. Debian by default uses User Private Groups (UPG).
- https://wiki.debian.org/UserPrivateGroups
- /usr/share/pam-configs/usergroups-security-misc
- .
- * Create home directory on login with umask 027 using
- pam_mkhomedir.so umask=027
- /usr/share/pam-configs/mkhomedir-security-misc
.
* Removes read, write and execute access for others for all users who have
home folders under folder /home by running for example
diff --git a/debian/copyright b/debian/copyright
index 4070441..513503a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,73 +71,3 @@ License: GPL-3+-with-additional-terms-1
ACTION, LAWSUITS, JUDGMENTS EXPENSES (INCLUDING WITHOUT LIMITATION REASONABLE
ATTORNEYS' FEES AND EXPENSES) OR ANY OTHER LIABILITY ARISING FROM, RELATED TO OR
IN CONNECTION WITH YOUR ASSUMPTIONS OF LIABILITY.
- .
-
-Files: etc/login.defs.security-misc
-Copyright:
- This is Debian GNU/Linux's prepackaged version of the shadow utilities.
- .
- It was downloaded from: .
- As of May 2007, this site is no longer available.
- .
- Copyright:
- .
- Parts of this software are copyright 1988 - 1994, Julianne Frances Haugh.
- All rights reserved.
- .
- Parts of this software are copyright 1997 - 2001, Marek Michałkiewicz.
- All rights reserved.
- .
- Parts of this software are copyright 2001 - 2004, Andrzej Krzysztofowicz
- All rights reserved.
- .
- Parts of this software are copyright 2000 - 2007, Tomasz Kłoczko.
- All rights reserved.
-License: shadow-license
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of Julianne F. Haugh nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- .
- This source code is currently archived on ftp.uu.net in the
- comp.sources.misc portion of the USENET archives. You may also contact
- the author, Julianne F. Haugh, at jockgrrl@ix.netcom.com if you have
- any questions regarding this package.
- .
- THIS SOFTWARE IS BEING DISTRIBUTED AS-IS. THE AUTHORS DISCLAIM ALL
- LIABILITY FOR ANY CONSEQUENCES OF USE. THE USER IS SOLELY RESPONSIBLE
- FOR THE MAINTENANCE OF THIS SOFTWARE PACKAGE. THE AUTHORS ARE UNDER NO
- OBLIGATION TO PROVIDE MODIFICATIONS OR IMPROVEMENTS. THE USER IS
- ENCOURAGED TO TAKE ANY AND ALL STEPS NEEDED TO PROTECT AGAINST ACCIDENTAL
- LOSS OF INFORMATION OR MACHINE RESOURCES.
- .
- Special thanks are due to Chip Rosenthal for his fine testing efforts;
- to Steve Simmons for his work in porting this code to BSD; and to Bill
- Kennedy for his contributions of LaserJet printer time and energies.
- Also, thanks for Dennis L. Mumaugh for the initial shadow password
- information and to Tony Walton (olapw@olgb1.oliv.co.uk) for the System
- V Release 4 changes. Effort in porting to SunOS has been contributed
- by Dr. Michael Newberry (miken@cs.adfa.oz.au) and Micheal J. Miller, Jr.
- (mke@kaberd.rain.com). Effort in porting to AT&T UNIX System V Release
- 4 has been provided by Andrew Herbert (andrew@werple.pub.uu.oz.au).
- Special thanks to Marek Michalkiewicz (marekm@i17linuxb.ists.pwr.wroc.pl)
- for taking over the Linux port of this software.
diff --git a/debian/security-misc.displace b/debian/security-misc.displace
index 9bce6c3..c94cc0f 100644
--- a/debian/security-misc.displace
+++ b/debian/security-misc.displace
@@ -1,5 +1,4 @@
## Copyright (C) 2019 - 2019 ENCRYPTED SUPPORT LP
## See the file COPYING for copying conditions.
-/etc/login.defs.security-misc
/etc/securetty.security-misc
diff --git a/etc/sudoers.d/umask-security-misc b/debian/security-misc.undisplace
similarity index 73%
rename from etc/sudoers.d/umask-security-misc
rename to debian/security-misc.undisplace
index 76ae15a..db0d1fd 100644
--- a/etc/sudoers.d/umask-security-misc
+++ b/debian/security-misc.undisplace
@@ -1,5 +1,4 @@
## Copyright (C) 2019 - 2019 ENCRYPTED SUPPORT LP
## See the file COPYING for copying conditions.
-Defaults umask = 027
-Defaults umask_override
+/etc/login.defs.security-misc
diff --git a/etc/login.defs.security-misc b/etc/login.defs.security-misc
deleted file mode 100644
index ae4c173..0000000
--- a/etc/login.defs.security-misc
+++ /dev/null
@@ -1,337 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed. All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux. --marekm
-
-# REQUIRED for useradd/userdel/usermod
-# Directory where mailboxes reside, _or_ name of file, relative to the
-# home directory. If you _do_ define MAIL_DIR and MAIL_FILE,
-# MAIL_DIR takes precedence.
-#
-# Essentially:
-# - MAIL_DIR defines the location of users mail spool files
-# (for mbox use) by appending the username to MAIL_DIR as defined
-# below.
-# - MAIL_FILE defines the location of the users mail spool files as the
-# fully-qualified filename obtained by prepending the user home
-# directory before $MAIL_FILE
-#
-# NOTE: This is no more used for setting up users MAIL environment variable
-# which is, starting from shadow 4.0.12-1 in Debian, entirely the
-# job of the pam_mail PAM modules
-# See default PAM configuration files provided for
-# login, su, etc.
-#
-# This is a temporary situation: setting these variables will soon
-# move to /etc/default/useradd and the variables will then be
-# no more supported
-MAIL_DIR /var/mail
-#MAIL_FILE .mail
-
-#
-# Enable logging and display of /var/log/faillog login failure info.
-# This option conflicts with the pam_tally PAM module.
-#
-FAILLOG_ENAB yes
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-# WARNING: Unknown usernames may become world readable.
-# See #290803 and #298773 for details about how this could become a security
-# concern
-LOG_UNKFAIL_ENAB no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB yes
-SYSLOG_SG_ENAB yes
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE /var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100 tty01".
-#
-#TTYTYPE_FILE /etc/ttytype
-
-#
-# If defined, login failures will be logged here in a utmp format
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE /var/log/btmp
-
-#
-# If defined, the command name to display when running "su -". For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su". If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME su
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence. If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file. If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE .hushlogin
-#HUSHLOGIN_FILE /etc/hushlogins
-
-#
-# *REQUIRED* The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV_PATH PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
-
-#
-# Terminal permissions
-#
-# TTYGROUP Login tty will be assigned this group ownership.
-# TTYPERM Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-# In Debian /usr/bin/bsd-write or similar programs are setgid tty
-# However, the default and recommended value for TTYPERM is still 0600
-# to not allow anyone to write to anyone else console or terminal
-
-# Users can still allow other people to write them by issuing
-# the "mesg y" command.
-
-TTYGROUP tty
-TTYPERM 0600
-
-#
-# Login configuration initializations:
-#
-# ERASECHAR Terminal ERASE character ('\010' = backspace).
-# KILLCHAR Terminal KILL character ('\025' = CTRL/U).
-# UMASK Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-#
-# UMASK is the default umask value for pam_umask and is used by
-# useradd and newusers to set the mode of the new home directories.
-# 022 is the "historical" value in Debian for UMASK
-# 027, or even 077, could be considered better for privacy
-# There is no One True Answer here : each sysadmin must make up his/her
-# mind.
-#
-# If USERGROUPS_ENAB is set to "yes", that will modify this UMASK default value
-# for private user groups, i. e. the uid is the same as gid, and username is
-# the same as the primary group name: for these, the user permissions will be
-# used as group permissions, e. g. 022 will become 002.
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR 0177
-KILLCHAR 025
-UMASK 027
-
-#
-# Password aging controls:
-#
-# PASS_MAX_DAYS Maximum number of days a password may be used.
-# PASS_MIN_DAYS Minimum number of days allowed between password changes.
-# PASS_WARN_AGE Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS 99999
-PASS_MIN_DAYS 0
-PASS_WARN_AGE 7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN 1000
-UID_MAX 60000
-# System accounts
-#SYS_UID_MIN 100
-#SYS_UID_MAX 999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN 1000
-GID_MAX 60000
-# System accounts
-#SYS_GID_MIN 100
-#SYS_GID_MAX 999
-
-#
-# Max number of login retries if password is bad. This will most likely be
-# overriden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
-# an authentication module that does not enforce PAM_MAXTRIES.
-#
-LOGIN_RETRIES 5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT 60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone). If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-#
-CHFN_RESTRICT rwh
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD /usr/sbin/userdel_local
-
-#
-# If set to yes, userdel will remove the user's group if it contains no
-# more members, and useradd will create by default a group with the name
-# of the user.
-#
-# Other former uses of this variable such as setting the umask when
-# user==primary group are not used in PAM environments, such as Debian
-#
-USERGROUPS_ENAB yes
-
-#
-# Instead of the real user shell, the program specified by this parameter
-# will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
-# banner, ...) before running the actual shell.
-#
-# 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
-
-#
-# 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 deprecated. You should use ENCRYPT_METHOD.
-#
-#MD5_CRYPT_ENAB no
-
-#
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
-# If set to SHA256, SHA256-based algorithm will be used for encrypting password
-# If set to SHA512, SHA512-based algorithm will be used for encrypting password
-# If set to DES, DES-based algorithm will be used for encrypting password (default)
-# Overrides the MD5_CRYPT_ENAB option
-#
-# Note: It is recommended to use a value consistent with
-# the PAM modules configuration.
-#
-ENCRYPT_METHOD SHA512
-
-#
-# Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
-#
-# Define the number of SHA rounds.
-# With a lot of rounds, it is more difficult to brute forcing the password.
-# But note also that it more CPU resources will be needed to authenticate
-# users.
-#
-# If not specified, the libc will choose the default number of rounds (5000).
-# The values must be inside the 1000-999999999 range.
-# If only one of the MIN or MAX values is set, then this value will be used.
-# If MIN > MAX, the highest value will be used.
-#
-# SHA_CRYPT_MIN_ROUNDS 5000
-# SHA_CRYPT_MAX_ROUNDS 5000
-
-################# OBSOLETED BY PAM ##############
-# #
-# These options are now handled by PAM. Please #
-# edit the appropriate file in /etc/pam.d/ to #
-# enable the equivelants of them.
-#
-###############
-
-#MOTD_FILE
-#DIALUPS_CHECK_ENAB
-#LASTLOG_ENAB
-#MAIL_CHECK_ENAB
-#OBSCURE_CHECKS_ENAB
-#PORTTIME_CHECKS_ENAB
-#SU_WHEEL_ONLY
-#CRACKLIB_DICTPATH
-#PASS_CHANGE_TRIES
-#PASS_ALWAYS_WARN
-#ENVIRON_FILE
-#NOLOGINS_FILE
-#ISSUE_FILE
-#PASS_MIN_LEN
-#PASS_MAX_LEN
-#ULIMIT
-#ENV_HZ
-#CHFN_AUTH
-#CHSH_AUTH
-#FAIL_DELAY
-
-################# OBSOLETED #######################
-# #
-# These options are no more handled by shadow. #
-# #
-# Shadow utilities will display a warning if they #
-# still appear. #
-# #
-###################################################
-
-# CLOSE_SESSIONS
-# LOGIN_STRING
-# NO_PASSWORD_CONSOLE
-# QMAIL_DIR
diff --git a/usr/share/pam-configs/mkhomedir-security-misc b/usr/share/pam-configs/mkhomedir-security-misc
index 326013c..a260926 100644
--- a/usr/share/pam-configs/mkhomedir-security-misc
+++ b/usr/share/pam-configs/mkhomedir-security-misc
@@ -4,4 +4,4 @@ Priority: 100
Session-Type: Additional
Session-Interactive-Only: yes
Session:
- optional pam_mkhomedir.so umask=027
+ optional pam_mkhomedir.so
diff --git a/usr/share/pam-configs/usergroups-security-misc b/usr/share/pam-configs/usergroups-security-misc
deleted file mode 100644
index 993e999..0000000
--- a/usr/share/pam-configs/usergroups-security-misc
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: change default umask to 027 (by package security-misc)
-Default: yes
-Priority: 256
-Session-Type: Additional
-Session:
- optional pam_umask.so usergroups umask=027