Refreshed patches.

This commit is contained in:
nekral-guest
2011-11-06 19:08:11 +00:00
parent 4a5447d4d7
commit 6b8409e9e8
4 changed files with 14 additions and 12 deletions
+1
View File
@@ -43,6 +43,7 @@ shadow (1:4.1.5-1) unstable; urgency=low
+ debian/patches/506_relaxed_usernames
+ debian/patches/523_su_arguments_are_concatenated
+ debian/patches/542_useradd-O_option
+ debian/patches/428_grpck_add_prune_option
- debian/patches/506_relaxed_usernames: Really check if the user/group
name starts with a dash. Also forbid names starting with '+' or '~'.
Document the naming policy in useradd.8 / groupadd.8.
+6 -5
View File
@@ -19,11 +19,12 @@ Status wrt upstream: It could certainly be submitted to upstream.
/*
* Parse the command line arguments
*/
- while ((arg = getopt (argc, argv, "qrs")) != EOF) {
+ while ((arg = getopt (argc, argv, "qprs")) != EOF) {
switch (arg) {
case 'q':
/* quiet - ignored for now */
- while ((c = getopt_long (argc, argv, "hqrR:s",
+ while ((c = getopt_long (argc, argv, "hqprR:s",
long_options, NULL)) != -1) {
switch (c) {
case 'h':
usage (E_SUCCESS);
@@ -189,6 +190,9 @@
case 's':
sort_mode = true;
+3 -3
View File
@@ -27,9 +27,9 @@ Note: It could be removed if pam_tally could report the number of failures
+ if ((NULL != pwd) && getdef_bool("FAILLOG_ENAB")) {
+ failure (pwd->pw_uid, tty, &faillog);
+ }
fprintf(stderr,
_("Maximum number of tries exceeded (%u)\n"),
failcount);
fprintf (stderr,
_("Maximum number of tries exceeded (%u)\n"),
failcount);
@@ -812,6 +815,14 @@
pam_strerror (pamh, retcode)));
failed = true;
+4 -4
View File
@@ -25,11 +25,11 @@ Status wrt upstream: not included as this is just specific
};
while ((c = getopt_long (argc, argv,
#ifdef WITH_SELINUX
- "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:UZ:",
+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:UZ:",
- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:UZ:",
+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:UZ:",
#else
- "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:U",
+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:U",
- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:U",
+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:U",
#endif
long_options, NULL)) != -1) {
switch (c) {