commit
4d3c9edfec
@ -0,0 +1 @@
|
|||||||
|
SOURCES/shadow-4.15.0.tar.xz
|
@ -0,0 +1 @@
|
|||||||
|
cb918a7412f5b57d268e3b1964111c9cdb84bb56 SOURCES/shadow-4.15.0.tar.xz
|
@ -0,0 +1,339 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
|
software--to make sure the software is free for all its users. This
|
||||||
|
General Public License applies to most of the Free Software
|
||||||
|
Foundation's software and to any other program whose authors commit to
|
||||||
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
|
the GNU Lesser General Public License instead.) You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if you
|
||||||
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
|
|
||||||
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
|
|
||||||
|
Also, for each author's protection and ours, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
software. If the software is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original, so
|
||||||
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
|
program will individually obtain patent licenses, in effect making the
|
||||||
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
|
patent must be licensed for everyone's free use or not licensed at all.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License applies to any program or other work which contains
|
||||||
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
|
under the terms of this General Public License. The "Program", below,
|
||||||
|
refers to any such program or work, and a "work based on the Program"
|
||||||
|
means either the Program or any derivative work under copyright law:
|
||||||
|
that is to say, a work containing the Program or a portion of it,
|
||||||
|
either verbatim or with modifications and/or translated into another
|
||||||
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running the Program is not restricted, and the output from the Program
|
||||||
|
is covered only if its contents constitute a work based on the
|
||||||
|
Program (independent of having been made by running the Program).
|
||||||
|
Whether that is true depends on what the Program does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
|
and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
|
of it, thus forming a work based on the Program, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) You must cause the modified files to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
|
whole or in part contains or is derived from the Program or any
|
||||||
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
|
parties under the terms of this License.
|
||||||
|
|
||||||
|
c) If the modified program normally reads commands interactively
|
||||||
|
when run, you must cause it, when started running for such
|
||||||
|
interactive use in the most ordinary way, to print or display an
|
||||||
|
announcement including an appropriate copyright notice and a
|
||||||
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
|
these conditions, and telling the user how to view a copy of this
|
||||||
|
License. (Exception: if the Program itself is interactive but
|
||||||
|
does not normally print such an announcement, your work based on
|
||||||
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Program,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Program.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Program
|
||||||
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
|
under Section 2) in object code or executable form under the terms of
|
||||||
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
|
|
||||||
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
|
source code, which must be distributed under the terms of Sections
|
||||||
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
|
machine-readable copy of the corresponding source code, to be
|
||||||
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
|
customarily used for software interchange; or,
|
||||||
|
|
||||||
|
c) Accompany it with the information you received as to the offer
|
||||||
|
to distribute corresponding source code. (This alternative is
|
||||||
|
allowed only for noncommercial distribution and only if you
|
||||||
|
received the program in object code or executable form with such
|
||||||
|
an offer, in accord with Subsection b above.)
|
||||||
|
|
||||||
|
The source code for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
|
associated interface definition files, plus the scripts used to
|
||||||
|
control compilation and installation of the executable. However, as a
|
||||||
|
special exception, the source code distributed need not include
|
||||||
|
anything that is normally distributed (in either source or binary
|
||||||
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component
|
||||||
|
itself accompanies the executable.
|
||||||
|
|
||||||
|
If distribution of executable or object code is made by offering
|
||||||
|
access to copy from a designated place, then offering equivalent
|
||||||
|
access to copy the source code from the same place counts as
|
||||||
|
distribution of the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
|
except as expressly provided under this License. Any attempt
|
||||||
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
|
void, and will automatically terminate your rights under this License.
|
||||||
|
However, parties who have received copies, or rights, from you under
|
||||||
|
this License will not have their licenses terminated so long as such
|
||||||
|
parties remain in full compliance.
|
||||||
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Program or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Program (or any work based on the
|
||||||
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Program or works based on it.
|
||||||
|
|
||||||
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
|
Program), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
|
these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Program at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Program by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under
|
||||||
|
any particular circumstance, the balance of the section is intended to
|
||||||
|
apply and the section as a whole is intended to apply in other
|
||||||
|
circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system, which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Program under this License
|
||||||
|
may add an explicit geographical distribution limitation excluding
|
||||||
|
those countries, so that distribution is permitted only in or among
|
||||||
|
countries not thus excluded. In such case, this License incorporates
|
||||||
|
the limitation as if written in the body of this License.
|
||||||
|
|
||||||
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies a version number of this License which applies to it and "any
|
||||||
|
later version", you have the option of following the terms and conditions
|
||||||
|
either of that version or of any later version published by the Free
|
||||||
|
Software Foundation. If the Program does not specify a version number of
|
||||||
|
this License, you may choose any version ever published by the Free Software
|
||||||
|
Foundation.
|
||||||
|
|
||||||
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
|
of preserving the free status of all derivatives of our free software and
|
||||||
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
|
REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program is interactive, make it output a short notice like this
|
||||||
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, the commands you use may
|
||||||
|
be called something other than `show w' and `show c'; they could even be
|
||||||
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1989
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
This General Public License does not permit incorporating your program into
|
||||||
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
|
consider it more useful to permit linking proprietary applications with the
|
||||||
|
library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License.
|
@ -0,0 +1,5 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
# This tool only uses the password stack.
|
||||||
|
password substack system-auth
|
||||||
|
-password optional pam_gnome_keyring.so use_authtok
|
||||||
|
password substack postlogin
|
@ -0,0 +1,380 @@
|
|||||||
|
diff -up shadow-4.15.0/src/chpasswd.c.account-tools-setuid shadow-4.15.0/src/chpasswd.c
|
||||||
|
--- shadow-4.15.0/src/chpasswd.c.account-tools-setuid 2024-03-08 22:27:04.000000000 +0100
|
||||||
|
+++ shadow-4.15.0/src/chpasswd.c 2024-03-11 11:21:57.561150382 +0100
|
||||||
|
@@ -443,9 +443,11 @@ int main (int argc, char **argv)
|
||||||
|
char *cp;
|
||||||
|
const char *salt;
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
bool use_pam = true;
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
int errors = 0;
|
||||||
|
int line = 0;
|
||||||
|
@@ -469,19 +471,23 @@ int main (int argc, char **argv)
|
||||||
|
process_root_flag ("-R", argc, argv);
|
||||||
|
prefix = process_prefix_flag ("-P", argc, argv);
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
if (md5flg || eflg || cflg || prefix[0]) {
|
||||||
|
use_pam = false;
|
||||||
|
}
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
OPENLOG (Prog);
|
||||||
|
|
||||||
|
check_perms ();
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
if (!use_pam)
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
{
|
||||||
|
is_shadow_pwd = spw_file_present ();
|
||||||
|
|
||||||
|
@@ -543,6 +549,7 @@ int main (int argc, char **argv)
|
||||||
|
}
|
||||||
|
newpwd = cp;
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
if (use_pam) {
|
||||||
|
if (do_pam_passwd_non_interactive (Prog, name, newpwd) != 0) {
|
||||||
|
@@ -553,6 +560,7 @@ int main (int argc, char **argv)
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
{
|
||||||
|
const struct spwd *sp;
|
||||||
|
struct spwd newsp;
|
||||||
|
@@ -672,9 +680,11 @@ int main (int argc, char **argv)
|
||||||
|
* password database.
|
||||||
|
*/
|
||||||
|
if (0 != errors) {
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
if (!use_pam)
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
{
|
||||||
|
fprintf (stderr,
|
||||||
|
_("%s: error detected, changes ignored\n"),
|
||||||
|
@@ -683,9 +693,11 @@ int main (int argc, char **argv)
|
||||||
|
fail_exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
if (!use_pam)
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
{
|
||||||
|
/* Save the changes */
|
||||||
|
close_files ();
|
||||||
|
diff -up shadow-4.15.0/src/groupmems.c.account-tools-setuid shadow-4.15.0/src/groupmems.c
|
||||||
|
--- shadow-4.15.0/src/groupmems.c.account-tools-setuid 2024-03-08 22:27:04.000000000 +0100
|
||||||
|
+++ shadow-4.15.0/src/groupmems.c 2024-03-11 11:16:18.365408572 +0100
|
||||||
|
@@ -14,9 +14,11 @@
|
||||||
|
#include <grp.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
#include "pam_defs.h"
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
#include <pwd.h>
|
||||||
|
|
||||||
|
#include "alloc.h"
|
||||||
|
@@ -430,6 +432,7 @@ static void process_flags (int argc, cha
|
||||||
|
static void check_perms (void)
|
||||||
|
{
|
||||||
|
if (!list) {
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
pam_handle_t *pamh = NULL;
|
||||||
|
int retval;
|
||||||
|
@@ -463,7 +466,8 @@ static void check_perms (void)
|
||||||
|
fail_exit (1);
|
||||||
|
}
|
||||||
|
(void) pam_end (pamh, retval);
|
||||||
|
-#endif
|
||||||
|
+#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up shadow-4.15.0/src/newusers.c.account-tools-setuid shadow-4.15.0/src/newusers.c
|
||||||
|
--- shadow-4.15.0/src/newusers.c.account-tools-setuid 2024-03-08 22:27:04.000000000 +0100
|
||||||
|
+++ shadow-4.15.0/src/newusers.c 2024-03-11 11:20:07.198909046 +0100
|
||||||
|
@@ -59,6 +59,7 @@
|
||||||
|
static const char Prog[] = "newusers";
|
||||||
|
|
||||||
|
static bool rflg = false; /* create a system account */
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
static /*@null@*//*@observer@*/char *crypt_method = NULL;
|
||||||
|
#define cflg (NULL != crypt_method)
|
||||||
|
@@ -75,6 +76,7 @@ static long bcrypt_rounds = 13;
|
||||||
|
static long yescrypt_cost = 5;
|
||||||
|
#endif /* USE_YESCRYPT */
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
static bool is_shadow;
|
||||||
|
#ifdef SHADOWGRP
|
||||||
|
@@ -97,9 +99,11 @@ NORETURN static void fail_exit (int);
|
||||||
|
static int add_group (const char *, const char *, gid_t *, gid_t);
|
||||||
|
static int get_user_id (const char *, uid_t *);
|
||||||
|
static int add_user (const char *, uid_t, gid_t);
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
static int update_passwd (struct passwd *, const char *);
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
static int add_passwd (struct passwd *, const char *);
|
||||||
|
static void process_flags (int argc, char **argv);
|
||||||
|
static void check_flags (void);
|
||||||
|
@@ -121,6 +125,7 @@ static void usage (int status)
|
||||||
|
"Options:\n"),
|
||||||
|
Prog);
|
||||||
|
(void) fputs (_(" -b, --badname allow bad names\n"), usageout);
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
(void) fprintf (usageout,
|
||||||
|
_(" -c, --crypt-method METHOD the crypt method (one of %s)\n"),
|
||||||
|
@@ -136,9 +141,11 @@ static void usage (int status)
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
|
||||||
|
(void) fputs (_(" -r, --system create system accounts\n"), usageout);
|
||||||
|
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
(void) fputs (_(" -s, --sha-rounds number of rounds for the SHA, BCRYPT\n"
|
||||||
|
@@ -146,6 +153,7 @@ static void usage (int status)
|
||||||
|
usageout);
|
||||||
|
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
(void) fputs ("\n", usageout);
|
||||||
|
|
||||||
|
exit (status);
|
||||||
|
@@ -405,6 +413,7 @@ static int add_user (const char *name, u
|
||||||
|
return (pw_update (&pwent) == 0) ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
/*
|
||||||
|
* update_passwd - update the password in the passwd entry
|
||||||
|
@@ -457,6 +466,7 @@ static int update_passwd (struct passwd
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* add_passwd - add or update the encrypted password
|
||||||
|
@@ -465,10 +475,13 @@ static int add_passwd (struct passwd *pw
|
||||||
|
{
|
||||||
|
const struct spwd *sp;
|
||||||
|
struct spwd spent;
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
char *cp;
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
void *crypt_arg = NULL;
|
||||||
|
if (NULL != crypt_method) {
|
||||||
|
@@ -505,13 +518,14 @@ static int add_passwd (struct passwd *pw
|
||||||
|
return update_passwd (pwd, password);
|
||||||
|
}
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Do the first and easiest shadow file case. The user already
|
||||||
|
* exists in the shadow password file.
|
||||||
|
*/
|
||||||
|
sp = spw_locate (pwd->pw_name);
|
||||||
|
-#ifndef USE_PAM
|
||||||
|
+#if !defined(ACCT_TOOLS_SETUID) && !defined(USE_PAM)
|
||||||
|
if (NULL != sp) {
|
||||||
|
spent = *sp;
|
||||||
|
if ( (NULL != crypt_method)
|
||||||
|
@@ -547,7 +561,7 @@ static int add_passwd (struct passwd *pw
|
||||||
|
if (strcmp (pwd->pw_passwd, "x") != 0) {
|
||||||
|
return update_passwd (pwd, password);
|
||||||
|
}
|
||||||
|
-#else /* USE_PAM */
|
||||||
|
+#else /* !ACCT_TOOLS_SETUID && !USE_PAM */
|
||||||
|
/*
|
||||||
|
* If there is already a shadow entry, do not touch it.
|
||||||
|
* If there is already a passwd entry with a password, do not
|
||||||
|
@@ -558,14 +572,14 @@ static int add_passwd (struct passwd *pw
|
||||||
|
|| (strcmp (pwd->pw_passwd, "x") != 0)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
-#endif /* USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID && !USE_PAM */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now the really hard case - I need to create an entirely new
|
||||||
|
* shadow password file entry.
|
||||||
|
*/
|
||||||
|
spent.sp_namp = pwd->pw_name;
|
||||||
|
-#ifndef USE_PAM
|
||||||
|
+#if !defined(ACCT_TOOLS_SETUID) && !defined(USE_PAM)
|
||||||
|
if ((crypt_method != NULL) && (0 == strcmp(crypt_method, "NONE"))) {
|
||||||
|
spent.sp_pwdp = (char *)password;
|
||||||
|
} else {
|
||||||
|
@@ -610,35 +624,41 @@ static int add_passwd (struct passwd *pw
|
||||||
|
static void process_flags (int argc, char **argv)
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
int bad_s;
|
||||||
|
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
static struct option long_options[] = {
|
||||||
|
{"badname", no_argument, NULL, 'b'},
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
{"crypt-method", required_argument, NULL, 'c'},
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
{"help", no_argument, NULL, 'h'},
|
||||||
|
{"system", no_argument, NULL, 'r'},
|
||||||
|
{"root", required_argument, NULL, 'R'},
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
{"sha-rounds", required_argument, NULL, 's'},
|
||||||
|
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
{NULL, 0, NULL, '\0'}
|
||||||
|
};
|
||||||
|
|
||||||
|
while ((c = getopt_long (argc, argv,
|
||||||
|
-#ifndef USE_PAM
|
||||||
|
+#if !defined(ACCT_TOOLS_SETUID) && !defined(USE_PAM)
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
"c:bhrs:",
|
||||||
|
#else /* !USE_SHA_CRYPT && !USE_BCRYPT && !USE_YESCRYPT */
|
||||||
|
"c:bhr",
|
||||||
|
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
|
||||||
|
-#else /* USE_PAM */
|
||||||
|
+#else /* !ACCT_TOOLS_SETUID && !USE_PAM */
|
||||||
|
"bhr",
|
||||||
|
#endif
|
||||||
|
long_options, NULL)) != -1) {
|
||||||
|
@@ -646,11 +666,13 @@ static void process_flags (int argc, cha
|
||||||
|
case 'b':
|
||||||
|
allow_bad_names = true;
|
||||||
|
break;
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
case 'c':
|
||||||
|
crypt_method = optarg;
|
||||||
|
break;
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
case 'h':
|
||||||
|
usage (EXIT_SUCCESS);
|
||||||
|
break;
|
||||||
|
@@ -659,6 +681,7 @@ static void process_flags (int argc, cha
|
||||||
|
break;
|
||||||
|
case 'R': /* no-op, handled in process_root_flag () */
|
||||||
|
break;
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
case 's':
|
||||||
|
@@ -698,6 +721,7 @@ static void process_flags (int argc, cha
|
||||||
|
break;
|
||||||
|
#endif /* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
default:
|
||||||
|
usage (EXIT_FAILURE);
|
||||||
|
break;
|
||||||
|
@@ -730,6 +754,7 @@ static void process_flags (int argc, cha
|
||||||
|
*/
|
||||||
|
static void check_flags (void)
|
||||||
|
{
|
||||||
|
+#ifndef ACCT_TOOLS_SETUID
|
||||||
|
#ifndef USE_PAM
|
||||||
|
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
|
||||||
|
if (sflg && !cflg) {
|
||||||
|
@@ -762,6 +787,7 @@ static void check_flags (void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* !USE_PAM */
|
||||||
|
+#endif /* !ACCT_TOOLS_SETUID */
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -1052,12 +1078,14 @@ int main (int argc, char **argv)
|
||||||
|
int line = 0;
|
||||||
|
uid_t uid;
|
||||||
|
gid_t gid;
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
int *lines = NULL;
|
||||||
|
char **usernames = NULL;
|
||||||
|
char **passwords = NULL;
|
||||||
|
unsigned int nusers = 0;
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
log_set_progname(Prog);
|
||||||
|
log_set_logfd(stderr);
|
||||||
|
@@ -1195,6 +1223,7 @@ int main (int argc, char **argv)
|
||||||
|
}
|
||||||
|
newpw = *pw;
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
/* keep the list of user/password for later update by PAM */
|
||||||
|
nusers++;
|
||||||
|
@@ -1211,6 +1240,7 @@ int main (int argc, char **argv)
|
||||||
|
usernames[nusers-1] = strdup (fields[0]);
|
||||||
|
passwords[nusers-1] = strdup (fields[1]);
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
if (add_passwd (&newpw, fields[1]) != 0) {
|
||||||
|
fprintf (stderr,
|
||||||
|
_("%s: line %d: can't update password\n"),
|
||||||
|
@@ -1327,6 +1357,7 @@ int main (int argc, char **argv)
|
||||||
|
nscd_flush_cache ("group");
|
||||||
|
sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP);
|
||||||
|
|
||||||
|
+#ifdef ACCT_TOOLS_SETUID
|
||||||
|
#ifdef USE_PAM
|
||||||
|
unsigned int i;
|
||||||
|
/* Now update the passwords using PAM */
|
||||||
|
@@ -1339,6 +1370,7 @@ int main (int argc, char **argv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* USE_PAM */
|
||||||
|
+#endif /* ACCT_TOOLS_SETUID */
|
||||||
|
|
||||||
|
exit (EXIT_SUCCESS);
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,69 @@
|
|||||||
|
Index: shadow-4.5/lib/getdate.y
|
||||||
|
===================================================================
|
||||||
|
--- shadow-4.5.orig/lib/getdate.y
|
||||||
|
+++ shadow-4.5/lib/getdate.y
|
||||||
|
@@ -152,6 +152,7 @@ static int yyHaveDay;
|
||||||
|
static int yyHaveRel;
|
||||||
|
static int yyHaveTime;
|
||||||
|
static int yyHaveZone;
|
||||||
|
+static int yyHaveYear;
|
||||||
|
static int yyTimezone;
|
||||||
|
static int yyDay;
|
||||||
|
static int yyHour;
|
||||||
|
@@ -293,18 +294,21 @@ date : tUNUMBER '/' tUNUMBER {
|
||||||
|
yyDay = $3;
|
||||||
|
yyYear = $5;
|
||||||
|
}
|
||||||
|
+ yyHaveYear++;
|
||||||
|
}
|
||||||
|
| tUNUMBER tSNUMBER tSNUMBER {
|
||||||
|
/* ISO 8601 format. yyyy-mm-dd. */
|
||||||
|
yyYear = $1;
|
||||||
|
yyMonth = -$2;
|
||||||
|
yyDay = -$3;
|
||||||
|
+ yyHaveYear++;
|
||||||
|
}
|
||||||
|
| tUNUMBER tMONTH tSNUMBER {
|
||||||
|
/* e.g. 17-JUN-1992. */
|
||||||
|
yyDay = $1;
|
||||||
|
yyMonth = $2;
|
||||||
|
yyYear = -$3;
|
||||||
|
+ yyHaveYear++;
|
||||||
|
}
|
||||||
|
| tMONTH tUNUMBER {
|
||||||
|
yyMonth = $1;
|
||||||
|
@@ -314,6 +318,7 @@ date : tUNUMBER '/' tUNUMBER {
|
||||||
|
yyMonth = $1;
|
||||||
|
yyDay = $2;
|
||||||
|
yyYear = $4;
|
||||||
|
+ yyHaveYear++;
|
||||||
|
}
|
||||||
|
| tUNUMBER tMONTH {
|
||||||
|
yyMonth = $2;
|
||||||
|
@@ -323,6 +328,7 @@ date : tUNUMBER '/' tUNUMBER {
|
||||||
|
yyMonth = $2;
|
||||||
|
yyDay = $1;
|
||||||
|
yyYear = $3;
|
||||||
|
+ yyHaveYear++;
|
||||||
|
}
|
||||||
|
;
|
||||||
|
|
||||||
|
@@ -395,7 +401,8 @@ relunit : tUNUMBER tYEAR_UNIT {
|
||||||
|
|
||||||
|
number : tUNUMBER
|
||||||
|
{
|
||||||
|
- if ((yyHaveTime != 0) && (yyHaveDate != 0) && (yyHaveRel == 0))
|
||||||
|
+ if ((yyHaveTime != 0 || $1 >= 100) && !yyHaveYear
|
||||||
|
+ && (yyHaveDate != 0) && (yyHaveRel == 0))
|
||||||
|
yyYear = $1;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -802,7 +809,7 @@ yylex (void)
|
||||||
|
return LookupWord (buff);
|
||||||
|
}
|
||||||
|
if (c != '(')
|
||||||
|
- return *yyInput++;
|
||||||
|
+ return (unsigned char)*yyInput++;
|
||||||
|
Count = 0;
|
||||||
|
do
|
||||||
|
{
|
@ -0,0 +1,137 @@
|
|||||||
|
From ead55e9ba8958504e23e29545f90c4dd925c7462 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Serge Hallyn <serge@hallyn.com>
|
||||||
|
Date: Wed, 20 Mar 2024 17:39:46 -0500
|
||||||
|
Subject: [PATCH] getdef: avoid spurious error messages about unknown
|
||||||
|
configuration options
|
||||||
|
|
||||||
|
def_find can return NULL for unset, not just unknown, config options. So
|
||||||
|
move the decision of whether to log an error message about an unknown config
|
||||||
|
option back into def_find, which knows the difference. Only putdef_str()
|
||||||
|
will pass a char* srcfile to def_find, so only calls from putdef_str will
|
||||||
|
cause the message, which was the original intent of fa68441bc4be8.
|
||||||
|
|
||||||
|
closes #967
|
||||||
|
|
||||||
|
fixes: fa68441bc4be8 ("Improve the login.defs unknown item error message")
|
||||||
|
Signed-off-by: Serge Hallyn <serge@hallyn.com>
|
||||||
|
---
|
||||||
|
lib/getdef.c | 30 ++++++++++++++++--------------
|
||||||
|
1 file changed, 16 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/getdef.c b/lib/getdef.c
|
||||||
|
index 4d4d4e19..ef2ae1f0 100644
|
||||||
|
--- a/lib/getdef.c
|
||||||
|
+++ b/lib/getdef.c
|
||||||
|
@@ -176,7 +176,7 @@ static const char* def_fname = LOGINDEFS; /* login config defs file */
|
||||||
|
static bool def_loaded = false; /* are defs already loaded? */
|
||||||
|
|
||||||
|
/* local function prototypes */
|
||||||
|
-static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *);
|
||||||
|
+static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *, const char *);
|
||||||
|
static void def_load (void);
|
||||||
|
|
||||||
|
|
||||||
|
@@ -195,7 +195,7 @@ static void def_load (void);
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
return (NULL == d) ? NULL : d->value;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -214,7 +214,7 @@ bool getdef_bool (const char *item)
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
if ((NULL == d) || (NULL == d->value)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@@ -240,7 +240,7 @@ int getdef_num (const char *item, int dflt)
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
if ((NULL == d) || (NULL == d->value)) {
|
||||||
|
return dflt;
|
||||||
|
}
|
||||||
|
@@ -275,7 +275,7 @@ unsigned int getdef_unum (const char *item, unsigned int dflt)
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
if ((NULL == d) || (NULL == d->value)) {
|
||||||
|
return dflt;
|
||||||
|
}
|
||||||
|
@@ -310,7 +310,7 @@ long getdef_long (const char *item, long dflt)
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
if ((NULL == d) || (NULL == d->value)) {
|
||||||
|
return dflt;
|
||||||
|
}
|
||||||
|
@@ -342,7 +342,7 @@ unsigned long getdef_ulong (const char *item, unsigned long dflt)
|
||||||
|
def_load ();
|
||||||
|
}
|
||||||
|
|
||||||
|
- d = def_find (item);
|
||||||
|
+ d = def_find (item, NULL);
|
||||||
|
if ((NULL == d) || (NULL == d->value)) {
|
||||||
|
return dflt;
|
||||||
|
}
|
||||||
|
@@ -375,12 +375,9 @@ int putdef_str (const char *name, const char *value, const char *srcfile)
|
||||||
|
* Locate the slot to save the value. If this parameter
|
||||||
|
* is unknown then "def_find" will print an err message.
|
||||||
|
*/
|
||||||
|
- d = def_find (name);
|
||||||
|
- if (NULL == d) {
|
||||||
|
- if (NULL != srcfile)
|
||||||
|
- SYSLOG ((LOG_CRIT, "shadow: unknown configuration item '%s' in '%s'", name, srcfile));
|
||||||
|
+ d = def_find (name, srcfile);
|
||||||
|
+ if (NULL == d)
|
||||||
|
return -1;
|
||||||
|
- }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Save off the value.
|
||||||
|
@@ -404,9 +401,12 @@ int putdef_str (const char *name, const char *value, const char *srcfile)
|
||||||
|
*
|
||||||
|
* Search through a table of configurable items to locate the
|
||||||
|
* specified configuration option.
|
||||||
|
+ *
|
||||||
|
+ * If srcfile is not NULL, and the item is not found, then report an error saying
|
||||||
|
+ * the unknown item was used in this file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name)
|
||||||
|
+static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name, const char *srcfile)
|
||||||
|
{
|
||||||
|
struct itemdef *ptr;
|
||||||
|
|
||||||
|
@@ -432,6 +432,8 @@ static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name)
|
||||||
|
fprintf (shadow_logfd,
|
||||||
|
_("configuration error - unknown item '%s' (notify administrator)\n"),
|
||||||
|
name);
|
||||||
|
+ if (srcfile != NULL)
|
||||||
|
+ SYSLOG ((LOG_CRIT, "shadow: unknown configuration item '%s' in '%s'", name, srcfile));
|
||||||
|
|
||||||
|
out:
|
||||||
|
return NULL;
|
||||||
|
@@ -610,7 +612,7 @@ int main (int argc, char **argv)
|
||||||
|
def_load ();
|
||||||
|
|
||||||
|
for (i = 0; i < NUMDEFS; ++i) {
|
||||||
|
- d = def_find (def_table[i].name);
|
||||||
|
+ d = def_find (def_table[i].name, NULL);
|
||||||
|
if (NULL == d) {
|
||||||
|
printf ("error - lookup '%s' failed\n",
|
||||||
|
def_table[i].name);
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
@ -0,0 +1,162 @@
|
|||||||
|
diff -up shadow-4.15.0/man/groupmems.8.xml.manfix shadow-4.15.0/man/groupmems.8.xml
|
||||||
|
--- shadow-4.15.0/man/groupmems.8.xml.manfix 2023-05-26 04:56:11.000000000 +0200
|
||||||
|
+++ shadow-4.15.0/man/groupmems.8.xml 2024-02-09 10:42:20.337036378 +0100
|
||||||
|
@@ -156,20 +156,10 @@
|
||||||
|
<refsect1 id='setup'>
|
||||||
|
<title>SETUP</title>
|
||||||
|
<para>
|
||||||
|
- The <command>groupmems</command> executable should be in mode
|
||||||
|
- <literal>2710</literal> as user <emphasis>root</emphasis> and in group
|
||||||
|
- <emphasis>groups</emphasis>. The system administrator can add users to
|
||||||
|
- group <emphasis>groups</emphasis> to allow or disallow them using the
|
||||||
|
- <command>groupmems</command> utility to manage their own group
|
||||||
|
- membership list.
|
||||||
|
+ In this operating system the <command>groupmems</command> executable
|
||||||
|
+ is not setuid and regular users cannot use it to manipulate
|
||||||
|
+ the membership of their own group.
|
||||||
|
</para>
|
||||||
|
-
|
||||||
|
- <programlisting>
|
||||||
|
- $ groupadd -r groups
|
||||||
|
- $ chmod 2710 groupmems
|
||||||
|
- $ chown root:groups groupmems
|
||||||
|
- $ groupmems -g groups -a gk4
|
||||||
|
- </programlisting>
|
||||||
|
</refsect1>
|
||||||
|
|
||||||
|
<refsect1 id='configuration'>
|
||||||
|
diff -up shadow-4.15.0/man/ja/man5/login.defs.5.manfix shadow-4.15.0/man/ja/man5/login.defs.5
|
||||||
|
--- shadow-4.15.0/man/ja/man5/login.defs.5.manfix 2023-03-13 21:58:56.000000000 +0100
|
||||||
|
+++ shadow-4.15.0/man/ja/man5/login.defs.5 2024-02-09 10:42:20.337036378 +0100
|
||||||
|
@@ -123,10 +123,6 @@ 以下の参照表は、
|
||||||
|
shadow パスワード機能のどのプログラムが
|
||||||
|
どのパラメータを使用するかを示したものである。
|
||||||
|
.na
|
||||||
|
-.IP chfn 12
|
||||||
|
-CHFN_AUTH CHFN_RESTRICT
|
||||||
|
-.IP chsh 12
|
||||||
|
-CHFN_AUTH
|
||||||
|
.IP groupadd 12
|
||||||
|
GID_MAX GID_MIN
|
||||||
|
.IP newusers 12
|
||||||
|
diff -up shadow-4.15.0/man/login.defs.5.xml.manfix shadow-4.15.0/man/login.defs.5.xml
|
||||||
|
--- shadow-4.15.0/man/login.defs.5.xml.manfix 2024-01-22 22:36:43.000000000 +0100
|
||||||
|
+++ shadow-4.15.0/man/login.defs.5.xml 2024-02-09 10:45:49.014407259 +0100
|
||||||
|
@@ -144,6 +144,17 @@
|
||||||
|
long numeric parameters is machine-dependent.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
+ <para>
|
||||||
|
+ Please note that the parameters in this configuration file control the
|
||||||
|
+ behavior of the tools from the shadow-utils component. None of these
|
||||||
|
+ tools uses the PAM mechanism, and the utilities that use PAM (such as the
|
||||||
|
+ passwd command) should be configured elsewhere. The only values that
|
||||||
|
+ affect PAM modules are <emphasis>ENCRYPT_METHOD</emphasis> and <emphasis>SHA_CRYPT_MAX_ROUNDS</emphasis>
|
||||||
|
+ for pam_unix module, <emphasis>FAIL_DELAY</emphasis> for pam_faildelay module,
|
||||||
|
+ and <emphasis>UMASK</emphasis> for pam_umask module. Refer to
|
||||||
|
+ pam(8) for more information.
|
||||||
|
+ </para>
|
||||||
|
+
|
||||||
|
<para>The following configuration items are provided:</para>
|
||||||
|
|
||||||
|
<variablelist remap='IP'>
|
||||||
|
@@ -240,16 +251,6 @@
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
- <term>chfn</term>
|
||||||
|
- <listitem>
|
||||||
|
- <para>
|
||||||
|
- <phrase condition="no_pam">CHFN_AUTH</phrase>
|
||||||
|
- CHFN_RESTRICT
|
||||||
|
- <phrase condition="no_pam">LOGIN_STRING</phrase>
|
||||||
|
- </para>
|
||||||
|
- </listitem>
|
||||||
|
- </varlistentry>
|
||||||
|
- <varlistentry>
|
||||||
|
<term>chgpasswd</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
@@ -276,14 +277,6 @@
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
- <varlistentry condition="no_pam">
|
||||||
|
- <term>chsh</term>
|
||||||
|
- <listitem>
|
||||||
|
- <para>
|
||||||
|
- CHSH_AUTH LOGIN_STRING
|
||||||
|
- </para>
|
||||||
|
- </listitem>
|
||||||
|
- </varlistentry>
|
||||||
|
<!-- expiry: no variables (CONSOLE_GROUPS linked, but not used) -->
|
||||||
|
<!-- faillog: no variables -->
|
||||||
|
<varlistentry>
|
||||||
|
@@ -352,34 +345,6 @@
|
||||||
|
<para>LASTLOG_UID_MAX</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
- <varlistentry>
|
||||||
|
- <term>login</term>
|
||||||
|
- <listitem>
|
||||||
|
- <para>
|
||||||
|
- <phrase condition="no_pam">CONSOLE</phrase>
|
||||||
|
- CONSOLE_GROUPS DEFAULT_HOME
|
||||||
|
- <phrase condition="no_pam">ENV_HZ ENV_PATH ENV_SUPATH
|
||||||
|
- ENV_TZ ENVIRON_FILE</phrase>
|
||||||
|
- ERASECHAR FAIL_DELAY
|
||||||
|
- <phrase condition="no_pam">FAILLOG_ENAB</phrase>
|
||||||
|
- FAKE_SHELL
|
||||||
|
- <phrase condition="no_pam">FTMP_FILE</phrase>
|
||||||
|
- HUSHLOGIN_FILE
|
||||||
|
- <phrase condition="no_pam">ISSUE_FILE</phrase>
|
||||||
|
- KILLCHAR
|
||||||
|
- <phrase condition="no_pam">LASTLOG_ENAB LASTLOG_UID_MAX</phrase>
|
||||||
|
- LOGIN_RETRIES
|
||||||
|
- <phrase condition="no_pam">LOGIN_STRING</phrase>
|
||||||
|
- LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB
|
||||||
|
- <phrase condition="no_pam">MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE
|
||||||
|
- MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB
|
||||||
|
- QUOTAS_ENAB</phrase>
|
||||||
|
- TTYGROUP TTYPERM TTYTYPE_FILE
|
||||||
|
- <phrase condition="no_pam">ULIMIT UMASK</phrase>
|
||||||
|
- USERGROUPS_ENAB
|
||||||
|
- </para>
|
||||||
|
- </listitem>
|
||||||
|
- </varlistentry>
|
||||||
|
<!-- logoutd: no variables -->
|
||||||
|
<varlistentry>
|
||||||
|
<term>newgrp / sg</term>
|
||||||
|
@@ -451,32 +416,6 @@
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
- <varlistentry>
|
||||||
|
- <term>su</term>
|
||||||
|
- <listitem>
|
||||||
|
- <para>
|
||||||
|
- <phrase condition="no_pam">CONSOLE</phrase>
|
||||||
|
- CONSOLE_GROUPS DEFAULT_HOME
|
||||||
|
- <phrase condition="no_pam">ENV_HZ ENVIRON_FILE</phrase>
|
||||||
|
- ENV_PATH ENV_SUPATH
|
||||||
|
- <phrase condition="no_pam">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB
|
||||||
|
- MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase>
|
||||||
|
- SULOG_FILE SU_NAME
|
||||||
|
- <phrase condition="no_pam">SU_WHEEL_ONLY</phrase>
|
||||||
|
- SYSLOG_SU_ENAB
|
||||||
|
- <phrase condition="no_pam">USERGROUPS_ENAB</phrase>
|
||||||
|
- </para>
|
||||||
|
- </listitem>
|
||||||
|
- </varlistentry>
|
||||||
|
- <varlistentry condition="no_pam">
|
||||||
|
- <term>sulogin</term>
|
||||||
|
- <listitem>
|
||||||
|
- <para>
|
||||||
|
- ENV_HZ
|
||||||
|
- ENV_TZ
|
||||||
|
- </para>
|
||||||
|
- </listitem>
|
||||||
|
- </varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>useradd</term>
|
||||||
|
<listitem>
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCgAdFiEEflbiwT+nfOMVWa3JfcJMNsM0HSAFAmXrjOcACgkQfcJMNsM0
|
||||||
|
HSC+Xg/8DIzBlPlkuvgmKSQbTV2AsRDrGxRSSks36hAsi/uBNhpIi5RI5OftN9S2
|
||||||
|
PuuY+nfja8K1zbOt8IyUx8dLmBFbN5U3u53mb0W0hI2RQFn3G18Pg4CurzBktA6P
|
||||||
|
tQ23wr2YnWfjbq6k7ed8keAKh0CTxe+hy7IYpYww+RImxAuYOYgSoRn7qBbcFMkI
|
||||||
|
WUbg5dku4ijy+2N1llxjOX7hIKaYN+BlKBIxAiku4IBmxdRyVrKi5njmiFEQh8PG
|
||||||
|
53ZLW6lIy8Q2GJxZA+A/xEm+sZnaMuVTIKlQJouHTEYwhQ882PPm1lnFBFvoMPsk
|
||||||
|
mAXoUj4otJcXWnJbMgkFYv0BFWKKUpMdhT61miwGywOY8d60D9V85AnUjwRk8EOD
|
||||||
|
7pSGiVECZGEQsSaFXWDboYhNZZ7VlvpTUkMEphNfj7xENnGbr7BlgQEEPNpFwkUL
|
||||||
|
zNwIV30bP1qLwZD/MowjKfB5uc9MYt8Q7dP5IZNwqJv+WIRBQjr9LA3iGLxc3YfH
|
||||||
|
DlYLP8pLjmd0+4HuHdtlc2b8QSY5kLQKYy12MnvGL77EGUq76bjGVtgrE9AWy9V4
|
||||||
|
PRlS91lAdRqCCqAvWQ5wQx5lJwAED5uxAl64GEdyvHzGTkbFaH5DqTJBLd6v7Jyj
|
||||||
|
UTP+RxIAVrV+lCYy5TWwemeSlZkO/F0T/Lkk2wU/9S4rSltOkT4=
|
||||||
|
=fkei
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 1990 - 1994, Julianne Frances Haugh
|
||||||
|
* Copyright (c) 1996 - 2000, Marek Michałkiewicz
|
||||||
|
* Copyright (c) 2000 - 2006, Tomasz Kłoczko
|
||||||
|
* Copyright (c) 2007 - 2011, Nicolas François
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* 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. The name of the copyright holders or contributors may not be used to
|
||||||
|
* endorse or promote products derived from this software without
|
||||||
|
* specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT
|
||||||
|
* HOLDERS 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.
|
||||||
|
*/
|
||||||
|
|
@ -0,0 +1,43 @@
|
|||||||
|
<!--
|
||||||
|
Copyright (c) 1991 - 1993, Julianne Frances Haugh
|
||||||
|
Copyright (c) 1991 - 1993, Chip Rosenthal
|
||||||
|
Copyright (c) 2007 - 2009, Nicolas François
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
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. The name of the copyright holders or contributors may not be used to
|
||||||
|
endorse or promote products derived from this software without
|
||||||
|
specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT
|
||||||
|
HOLDERS 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.
|
||||||
|
-->
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>HOME_MODE</option> (number)</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The mode for new home directories. If not specified,
|
||||||
|
the <option>UMASK</option> is used to create the mode.
|
||||||
|
</para>
|
||||||
|
<para>
|
||||||
|
<command>useradd</command> and <command>newusers</command> use this
|
||||||
|
to set the mode of the home directory they create.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
@ -0,0 +1,315 @@
|
|||||||
|
#
|
||||||
|
# Please note that the parameters in this configuration file control the
|
||||||
|
# behavior of the tools from the shadow-utils component. None of these
|
||||||
|
# tools uses the PAM mechanism, and the utilities that use PAM (such as the
|
||||||
|
# passwd command) should therefore be configured elsewhere. Refer to
|
||||||
|
# /etc/pam.d/system-auth for more information.
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Delay in seconds before being allowed another attempt after a login failure
|
||||||
|
# Note: When PAM is used, some modules may enforce a minimum delay (e.g.
|
||||||
|
# pam_unix(8) enforces a 2s delay)
|
||||||
|
#
|
||||||
|
#FAIL_DELAY 3
|
||||||
|
|
||||||
|
# Currently FAILLOG_ENAB is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Enable display of unknown usernames when login(1) failures are recorded.
|
||||||
|
#
|
||||||
|
#LOG_UNKFAIL_ENAB no
|
||||||
|
|
||||||
|
# Currently LOG_OK_LOGINS is not supported
|
||||||
|
|
||||||
|
# Currently LASTLOG_ENAB is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Limit the highest user ID number for which the lastlog entries should
|
||||||
|
# be updated.
|
||||||
|
#
|
||||||
|
# No LASTLOG_UID_MAX means that there is no user ID limit for writing
|
||||||
|
# lastlog entries.
|
||||||
|
#
|
||||||
|
#LASTLOG_UID_MAX
|
||||||
|
|
||||||
|
# Currently MAIL_CHECK_ENAB is not supported
|
||||||
|
|
||||||
|
# Currently OBSCURE_CHECKS_ENAB is not supported
|
||||||
|
|
||||||
|
# Currently PORTTIME_CHECKS_ENAB is not supported
|
||||||
|
|
||||||
|
# Currently QUOTAS_ENAB is not supported
|
||||||
|
|
||||||
|
# Currently SYSLOG_SU_ENAB is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Enable "syslog" logging of newgrp(1) and sg(1) activity.
|
||||||
|
#
|
||||||
|
#SYSLOG_SG_ENAB yes
|
||||||
|
|
||||||
|
# Currently CONSOLE is not supported
|
||||||
|
|
||||||
|
# Currently SULOG_FILE is not supported
|
||||||
|
|
||||||
|
# Currently MOTD_FILE is not supported
|
||||||
|
|
||||||
|
# Currently ISSUE_FILE is not supported
|
||||||
|
|
||||||
|
# Currently TTYTYPE_FILE is not supported
|
||||||
|
|
||||||
|
# Currently FTMP_FILE is not supported
|
||||||
|
|
||||||
|
# Currently NOLOGINS_FILE is not supported
|
||||||
|
|
||||||
|
# Currently SU_NAME is not supported
|
||||||
|
|
||||||
|
# *REQUIRED*
|
||||||
|
# Directory where mailboxes reside, _or_ name of file, relative to the
|
||||||
|
# home directory. If you _do_ define both, MAIL_DIR takes precedence.
|
||||||
|
#
|
||||||
|
MAIL_DIR /var/spool/mail
|
||||||
|
#MAIL_FILE .mail
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# Currently ENV_TZ is not supported
|
||||||
|
|
||||||
|
# Currently ENV_HZ is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# The default PATH settings, for superuser and normal users.
|
||||||
|
#
|
||||||
|
# (they are minimal, add the rest in the shell startup files)
|
||||||
|
#ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
#ENV_PATH PATH=/bin:/usr/bin
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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(1) program which is "setgid" to a special group
|
||||||
|
# which owns the terminals, define TTYGROUP as the number of such group
|
||||||
|
# and TTYPERM as 0620. Otherwise leave TTYGROUP commented out and
|
||||||
|
# set TTYPERM to either 622 or 600.
|
||||||
|
#
|
||||||
|
#TTYGROUP tty
|
||||||
|
#TTYPERM 0600
|
||||||
|
|
||||||
|
# Currently ERASECHAR, KILLCHAR and ULIMIT are not supported
|
||||||
|
|
||||||
|
# Default initial "umask" value used by login(1) on non-PAM enabled systems.
|
||||||
|
# Default "umask" value for pam_umask(8) on PAM enabled systems.
|
||||||
|
# UMASK is also used by useradd(8) and newusers(8) to set the mode for new
|
||||||
|
# home directories if HOME_MODE is not set.
|
||||||
|
# 022 is the default value, but 027, or even 077, could be considered
|
||||||
|
# for increased privacy. There is no One True Answer here: each sysadmin
|
||||||
|
# must make up their mind.
|
||||||
|
UMASK 022
|
||||||
|
|
||||||
|
# HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new
|
||||||
|
# home directories.
|
||||||
|
# If HOME_MODE is not set, the value of UMASK is used to create the mode.
|
||||||
|
HOME_MODE 0700
|
||||||
|
|
||||||
|
# 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_MIN_LEN Minimum acceptable password length.
|
||||||
|
# PASS_WARN_AGE Number of days warning given before a password expires.
|
||||||
|
#
|
||||||
|
PASS_MAX_DAYS 99999
|
||||||
|
PASS_MIN_DAYS 0
|
||||||
|
PASS_MIN_LEN 8
|
||||||
|
PASS_WARN_AGE 7
|
||||||
|
|
||||||
|
# Currently SU_WHEEL_ONLY is not supported
|
||||||
|
|
||||||
|
# Currently CRACKLIB_DICTPATH is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Min/max values for automatic uid selection in useradd(8)
|
||||||
|
#
|
||||||
|
UID_MIN 1000
|
||||||
|
UID_MAX 60000
|
||||||
|
# System accounts
|
||||||
|
SYS_UID_MIN 201
|
||||||
|
SYS_UID_MAX 999
|
||||||
|
# Extra per user uids
|
||||||
|
SUB_UID_MIN 524288
|
||||||
|
SUB_UID_MAX 600100000
|
||||||
|
SUB_UID_COUNT 65536
|
||||||
|
|
||||||
|
#
|
||||||
|
# Min/max values for automatic gid selection in groupadd(8)
|
||||||
|
#
|
||||||
|
GID_MIN 1000
|
||||||
|
GID_MAX 60000
|
||||||
|
# System accounts
|
||||||
|
SYS_GID_MIN 201
|
||||||
|
SYS_GID_MAX 999
|
||||||
|
# Extra per user group ids
|
||||||
|
SUB_GID_MIN 524288
|
||||||
|
SUB_GID_MAX 600100000
|
||||||
|
SUB_GID_COUNT 65536
|
||||||
|
|
||||||
|
#
|
||||||
|
# Max number of login(1) retries if password is bad
|
||||||
|
#
|
||||||
|
#LOGIN_RETRIES 3
|
||||||
|
|
||||||
|
#
|
||||||
|
# Max time in seconds for login(1)
|
||||||
|
#
|
||||||
|
#LOGIN_TIMEOUT 60
|
||||||
|
|
||||||
|
#
|
||||||
|
# Maximum number of attempts to change password if rejected (too easy)
|
||||||
|
#
|
||||||
|
PASS_CHANGE_TRIES 5
|
||||||
|
|
||||||
|
#
|
||||||
|
# Warn about weak passwords (but still allow them) if you are root.
|
||||||
|
#
|
||||||
|
PASS_ALWAYS_WARN yes
|
||||||
|
|
||||||
|
#
|
||||||
|
# Number of significant characters in the password for crypt().
|
||||||
|
# Default is 8, don't change unless your crypt() is better.
|
||||||
|
# Ignored if MD5_CRYPT_ENAB set to "yes".
|
||||||
|
#
|
||||||
|
#PASS_MAX_LEN 8
|
||||||
|
|
||||||
|
# Currently CHFN_AUTH is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Which fields may be changed by regular users using chfn(1) - 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
|
||||||
|
|
||||||
|
# Currently LOGIN_STRING is not supported
|
||||||
|
|
||||||
|
# Currently MD5_CRYPT_ENAB is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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 BCRYPT, BCRYPT-based algorithm will be used for encrypting password
|
||||||
|
# If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password
|
||||||
|
# If set to DES, DES-based algorithm will be used for encrypting password (default)
|
||||||
|
#
|
||||||
|
ENCRYPT_METHOD YESCRYPT
|
||||||
|
|
||||||
|
#
|
||||||
|
# Only works 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-force the password.
|
||||||
|
# However, more CPU resources will be needed to authenticate users if
|
||||||
|
# this value is increased.
|
||||||
|
#
|
||||||
|
# If not specified, the libc will choose the default number of rounds (5000).
|
||||||
|
# The values must be within the 1000-999999999 range.
|
||||||
|
#
|
||||||
|
#SHA_CRYPT_MAX_ROUNDS 5000
|
||||||
|
|
||||||
|
# Currently SHA_CRYPT_MIN_ROUNDS is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Only works if ENCRYPT_METHOD is set to BCRYPT.
|
||||||
|
#
|
||||||
|
# Define the number of BCRYPT rounds.
|
||||||
|
# With a lot of rounds, it is more difficult to brute-force the password.
|
||||||
|
# However, more CPU resources will be needed to authenticate users if
|
||||||
|
# this value is increased.
|
||||||
|
#
|
||||||
|
# If not specified, 13 rounds will be attempted.
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
#BCRYPT_MIN_ROUNDS 13
|
||||||
|
#BCRYPT_MAX_ROUNDS 31
|
||||||
|
|
||||||
|
#
|
||||||
|
# Only works if ENCRYPT_METHOD is set to YESCRYPT.
|
||||||
|
#
|
||||||
|
# Define the YESCRYPT cost factor.
|
||||||
|
# With a higher cost factor, it is more difficult to brute-force the password.
|
||||||
|
# However, more CPU time and more memory will be needed to authenticate users
|
||||||
|
# if this value is increased.
|
||||||
|
#
|
||||||
|
# If not specified, a cost factor of 5 will be used.
|
||||||
|
# The value must be within the 1-11 range.
|
||||||
|
#
|
||||||
|
#YESCRYPT_COST_FACTOR 5
|
||||||
|
|
||||||
|
# Currently CONSOLE_GROUPS is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# Should login be allowed if we can't cd to the home directory?
|
||||||
|
# Default is yes.
|
||||||
|
#
|
||||||
|
#DEFAULT_HOME yes
|
||||||
|
|
||||||
|
# Currently ENVIRON_FILE is not supported
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
||||||
|
#
|
||||||
|
# Enables userdel(8) to remove user groups if no members exist.
|
||||||
|
#
|
||||||
|
USERGROUPS_ENAB yes
|
||||||
|
|
||||||
|
#
|
||||||
|
# If set to a non-zero number, the shadow utilities will make sure that
|
||||||
|
# groups never have more than this number of users on one line.
|
||||||
|
# This permits to support split groups (groups split into multiple lines,
|
||||||
|
# with the same group ID, to avoid limitation of the line length in the
|
||||||
|
# group file).
|
||||||
|
#
|
||||||
|
# 0 is the default value and disables this feature.
|
||||||
|
#
|
||||||
|
#MAX_MEMBERS_PER_GROUP 0
|
||||||
|
|
||||||
|
#
|
||||||
|
# If useradd(8) should create home directories for users by default (non
|
||||||
|
# system users only).
|
||||||
|
# This option is overridden with the -M or -m flags on the useradd(8)
|
||||||
|
# command-line.
|
||||||
|
#
|
||||||
|
CREATE_HOME yes
|
||||||
|
|
||||||
|
#
|
||||||
|
# Force use shadow, even if shadow passwd & shadow group files are
|
||||||
|
# missing.
|
||||||
|
#
|
||||||
|
#FORCE_SHADOW yes
|
||||||
|
|
||||||
|
#
|
||||||
|
# Select the HMAC cryptography algorithm.
|
||||||
|
# Used in pam_timestamp module to calculate the keyed-hash message
|
||||||
|
# authentication code.
|
||||||
|
#
|
||||||
|
# Note: It is recommended to check hmac(3) to see the possible algorithms
|
||||||
|
# that are available in your system.
|
||||||
|
#
|
||||||
|
HMAC_CRYPTO_ALGO SHA512
|
@ -0,0 +1,9 @@
|
|||||||
|
# useradd defaults file
|
||||||
|
GROUP=100
|
||||||
|
HOME=/home
|
||||||
|
INACTIVE=-1
|
||||||
|
EXPIRE=
|
||||||
|
SHELL=/bin/bash
|
||||||
|
SKEL=/etc/skel
|
||||||
|
CREATE_MAIL_SPOOL=yes
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue