diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 15:10:08 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 15:15:33 -0700 |
| commit | c75cefe8a382a63f625123c156137782db118f64 (patch) | |
| tree | 6d59b210627948cb606a073f1ce41d3a8c9ce7c9 /meta | |
| parent | ad841dbb667dc77b18db2427792601b33fb79d70 (diff) | |
| download | poky-c75cefe8a382a63f625123c156137782db118f64.tar.gz | |
libpam: Fix patch broken during upgrade1.9_M2
"0x200" became "0200" during the upgrade to libpam 1.2.1 in:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=88dd997d9941b63ae9eead6690ecf2b785c0740c
and this broke the IMAGE_FEATURES like debug-tweaks.
I've converted all the values to octal here to match the original
header file convention and make it clearer.
[YOCTO #8033]
(From OE-Core rev: 588e19058f631a1cc78002e1969a5459cd626afb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch index 423267f707..3241e82959 100644 --- a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch +++ b/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch | |||
| @@ -214,7 +214,7 @@ index 3729ce0..43cdbea 100644 | |||
| 214 | /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, | 214 | /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, |
| 215 | /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, | 215 | /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, |
| 216 | -/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, | 216 | -/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, |
| 217 | +/* UNIX__NONULL */ {NULL, _ALL_ON_^(0x10000000), 0200, 0}, | 217 | +/* UNIX__NONULL */ {NULL, _ALL_ON_^(02000000000), 01000, 0}, |
| 218 | /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, | 218 | /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, |
| 219 | /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, | 219 | /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, |
| 220 | /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, | 220 | /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, |
| @@ -222,7 +222,7 @@ index 3729ce0..43cdbea 100644 | |||
| 222 | /* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0400000000, 0}, | 222 | /* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0400000000, 0}, |
| 223 | /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, | 223 | /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, |
| 224 | /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, | 224 | /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, |
| 225 | +/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(0x200), 0x10000000, 0}, | 225 | +/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(01000), 02000000000, 0}, |
| 226 | }; | 226 | }; |
| 227 | 227 | ||
| 228 | #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) | 228 | #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) |