diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-09-29 13:14:30 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-30 15:01:46 +0100 |
| commit | 0f5d9d8cc5d05a7a485e4cb89b37d06ea0d05d23 (patch) | |
| tree | 754001a44247d6c408639fcf016d708c1d0570e5 /meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch | |
| parent | ef89f176d10ee82738aa050282d93b68dd2c4eb5 (diff) | |
| download | openembedded-core-contrib-0f5d9d8cc5d05a7a485e4cb89b37d06ea0d05d23.tar.gz | |
systemd: Drop 0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch
This patch is no longer needed as upstream has added including part of
this include list, perhaps thats all is what was needed to make it
portable
Refresh 0001-Handle-missing-gshadow.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch index 723cd2e52e..c5960a0d60 100644 --- a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch @@ -14,10 +14,8 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> src/shared/userdb.c | 6 ++++++ 3 files changed, 30 insertions(+) -Index: systemd-stable/src/shared/group-record-nss.c -=================================================================== ---- systemd-stable.orig/src/shared/group-record-nss.c -+++ systemd-stable/src/shared/group-record-nss.c +--- a/src/shared/group-record-nss.c ++++ b/src/shared/group-record-nss.c @@ -19,8 +19,10 @@ int nss_group_to_group_record( if (isempty(grp->gr_name)) return -EINVAL; @@ -35,7 +33,7 @@ Index: systemd-stable/src/shared/group-record-nss.c +#if ENABLE_GSHADOW if (sgrp) { - if (hashed_password_valid(sgrp->sg_passwd)) { + if (looks_like_hashed_password(sgrp->sg_passwd)) { g->hashed_password = strv_new(sgrp->sg_passwd); @@ -51,6 +54,7 @@ int nss_group_to_group_record( if (!g->administrators) @@ -119,10 +117,8 @@ Index: systemd-stable/src/shared/group-record-nss.c if (r < 0) return r; -Index: systemd-stable/src/shared/group-record-nss.h -=================================================================== ---- systemd-stable.orig/src/shared/group-record-nss.h -+++ systemd-stable/src/shared/group-record-nss.h +--- a/src/shared/group-record-nss.h ++++ b/src/shared/group-record-nss.h @@ -2,7 +2,11 @@ #pragma once @@ -135,10 +131,8 @@ Index: systemd-stable/src/shared/group-record-nss.h #include "group-record.h" -Index: systemd-stable/src/shared/userdb.c -=================================================================== ---- systemd-stable.orig/src/shared/userdb.c -+++ systemd-stable/src/shared/userdb.c +--- a/src/shared/userdb.c ++++ b/src/shared/userdb.c @@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator if (gr) { _cleanup_free_ char *buffer = NULL; |