Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pam_pkcs11 for openSUSE:Factory
checked in at 2024-05-10 12:05:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_pkcs11 (Old)
and /work/SRC/openSUSE:Factory/.pam_pkcs11.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_pkcs11"
Fri May 10 12:05:02 2024 rev:38 rq:1172952 version:0.6.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_pkcs11/pam_pkcs11.changes 2024-02-29
21:52:00.557619216 +0100
+++ /work/SRC/openSUSE:Factory/.pam_pkcs11.new.1880/pam_pkcs11.changes
2024-05-10 12:05:57.075257791 +0200
@@ -1,0 +2,6 @@
+Tue May 7 15:19:11 UTC 2024 - Davide Benini <davide.ben...@suse.com>
+
+- Fix for bsc#1221255:
+ * Add patch 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
+
+-------------------------------------------------------------------
New:
----
0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
BETA DEBUG BEGIN:
New:- Fix for bsc#1221255:
* Add patch 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_pkcs11.spec ++++++
--- /var/tmp/diff_new_pack.Vj8YqU/_old 2024-05-10 12:05:58.035292773 +0200
+++ /var/tmp/diff_new_pack.Vj8YqU/_new 2024-05-10 12:05:58.035292773 +0200
@@ -34,6 +34,7 @@
Patch0: %{name}-fsf-address.patch
Patch1: %{name}-0.5.3-nss-conf.patch
Patch3: %{name}-0.6.0-nss-autoconf.patch
+Patch4: 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
BuildRequires: curl-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
++++++ 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch ++++++
>From 8da6c472ddcf18a30676bf8f7c55785dd2de91c5 Mon Sep 17 00:00:00 2001
From: Paul Wolneykien <mano...@altlinux.org>
Date: Fri, 26 Apr 2024 18:10:24 +0300
Subject: [PATCH] Set 'slot_num' configuration parameter to 0 by default
See https://github.com/OpenSC/pam_pkcs11/pull/74 for details.
Signed-off-by: Paul Wolneykien <mano...@altlinux.org>
---
src/pam_pkcs11/pam_config.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
--- a/src/pam_pkcs11/pam_config.c
+++ b/src/pam_pkcs11/pam_config.c
@@ -50,7 +50,7 @@ struct configuration_st configuration =
NULL, /* const char *pkcs11_module_path; */
NULL, /* screen savers */
NULL, /* slot_description */
- -1, /* int slot_num; */
+ 0, /* int slot_num; */
0, /* support threads */
/* cert policy; */
{
@@ -167,13 +167,8 @@ static void parse_config_file(void) {
configuration.slot_num =
scconf_get_int(pkcs11_mblk,"slot_num",configuration.slot_num);
- if (configuration.slot_description != NULL &&
configuration.slot_num != -1) {
- DBG1("Can not specify both slot_description and slot_num in
file %s",configuration.config_file);
- return;
- }
-
- if (configuration.slot_description == NULL &&
configuration.slot_num == -1) {
- DBG1("Neither slot_description nor slot_num found in file
%s",configuration.config_file);
+ if (configuration.slot_description != NULL &&
configuration.slot_num != 0) {
+ DBG1("Can not specify both slot_description and slot_num != 0
in file %s",configuration.config_file);
return;
}
