From e178e8f5838273660d4fe1db2c3c98d5f66fbd9c Mon Sep 17 00:00:00 2001 From: huangzq6 Date: Wed, 18 Jan 2023 16:06:01 +0800 Subject: [PATCH] Fix kpropd crash with unrecognized option --- ...propd-crash-with-unrecognized-option.patch | 28 +++++++++++++++++++ krb5.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-kpropd-crash-with-unrecognized-option.patch diff --git a/backport-Fix-kpropd-crash-with-unrecognized-option.patch b/backport-Fix-kpropd-crash-with-unrecognized-option.patch new file mode 100644 index 0000000..53b5b6c --- /dev/null +++ b/backport-Fix-kpropd-crash-with-unrecognized-option.patch @@ -0,0 +1,28 @@ +From d0ea8de883a2487dfde8bfa377b64df1194ed5cb Mon Sep 17 00:00:00 2001 +From: abushwang +Date: Wed, 28 Dec 2022 15:06:02 +0800 +Subject: [PATCH] Fix kpropd crash with unrecognized option + +ticket: 9083 (new) +tags: pullup +target_version: 1.20-next +target_version: 1.19-next +--- + src/kprop/kpropd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c +index f2341d720..aa3c81ea3 100644 +--- a/src/kprop/kpropd.c ++++ b/src/kprop/kpropd.c +@@ -1047,6 +1047,7 @@ parse_args(int argc, char **argv) + enum { PID_FILE = 256 }; + struct option long_options[] = { + { "pid-file", 1, NULL, PID_FILE }, ++ { NULL, 0, NULL, 0 }, + }; + + memset(¶ms, 0, sizeof(params)); +-- +2.27.0 + diff --git a/krb5.spec b/krb5.spec index ee680ed..34603c2 100644 --- a/krb5.spec +++ b/krb5.spec @@ -3,7 +3,7 @@ Name: krb5 Version: 1.19.2 -Release: 6 +Release: 7 Summary: The Kerberos network authentication protocol License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -33,6 +33,7 @@ Patch10: backport-Fix-preauth-crash-on-memory-exhaustion.patch Patch11: backport-Fix-gic_keytab-crash-on-memory-exhaustion.patch Patch12: backport-Fix-many-unlikely-memory-leaks.patch Patch13: backport-Free-verto-context-later-in-KDC-cleanup.patch +Patch14: backport-Fix-kpropd-crash-with-unrecognized-option.patch BuildRequires: gettext BuildRequires: gcc make automake autoconf pkgconfig pam-devel libselinux-devel byacc @@ -324,6 +325,9 @@ make -C src check || : %{_mandir}/man8/* %changelog +* Wed Jan 18 2023 huangzq6 - 1.19.2-7 +- Fix kpropd crash with unrecognized option + * Wed Dec 21 2022 zhouchenchen - 1.19.2-6 - backport some patches -- Gitee