From 99858683d0620e7b21c0f4951923bba7cd00351b Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 11 Apr 2009 23:37:38 +0000 Subject: [PATCH] Updated debian/patches/542_useradd-O_option for shadow 4.1.3. --- debian/changelog | 1 + debian/patches/542_useradd-O_option | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8167375e..8b05db0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ shadow (1:4.1.3-1) unstable; urgency=low + debian/patches/401_cppw_src.dpatch + debian/patches/506_relaxed_usernames + debian/patches/463_login_delay_obeys_to_PAM + + debian/patches/542_useradd-O_option - Translations + New Kazakh translation. Closes: #517809 + Updated Slovak translation. Closes: #523621 diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index ab5e3288..5508dfa1 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -25,15 +25,18 @@ Index: shadow-4.1.0/src/useradd.c =================================================================== --- shadow-4.1.0.orig/src/useradd.c +++ shadow-4.1.0/src/useradd.c -@@ -1009,7 +1009,7 @@ - {NULL, 0, NULL, '\0'} +@@ -1009,9 +1009,9 @@ }; - while ((c = -- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U", -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U", - long_options, NULL)) != -1) { + while ((c = getopt_long (argc, argv, + #ifdef WITH_SELINUX +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:", ++ "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:UZ:", + #else +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U", ++ "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U", + #endif + long_options, NULL)) != -1) { switch (c) { - case 'b': @@ -1125,6 +1125,7 @@ kflg++; break;