From 4a41b4f5251f2e57ea46bb02560d82f0db4e705d Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Mon, 23 Oct 2023 08:49:51 +0200 Subject: [PATCH] tmpfiles.conf: Do not create token specific dirs inside /var/lock/opencryptoki/ Do not let tmpfiles.d create the token specific directories inside /var/lock/opencryptoki/. It is not known during build time which tokens will exist later during run time. A user may configure any number of tokens with any names in /etc/opencryptoki/opencryptoki.conf. The API layer will create any non-existing token specific lock directories inside /var/lock/opencryptoki/ during C_Initialize() as needed. Signed-off-by: Ingo Franzki --- misc/misc.mk | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/misc/misc.mk b/misc/misc.mk index f01574f2..4fdf9adb 100644 --- a/misc/misc.mk +++ b/misc/misc.mk @@ -1,25 +1,3 @@ -TOKENS = swtok - -if ENABLE_ICATOK -TOKENS += lite -endif - -if ENABLE_EP11TOK -TOKENS += ep11tok -endif - -if ENABLE_TPMTOK -TOKENS += tpm -endif - -if ENABLE_CCATOK -TOKENS += ccatok -endif - -if ENABLE_ICSFTOK -TOKENS += icsf -endif - EXTRA_DIST += misc/pkcsslotd.in misc/pkcsslotd.service.in \ misc/tmpfiles.conf.in misc/opencryptoki.pc.in @@ -49,8 +27,6 @@ ${srcdir}/misc/opencryptoki.conf: ${srcdir}/misc/tmpfiles.conf.in -e s!\@localstatedir\@!$(localstatedir)!g \ -e s!\@pkcsslotd_user\@!$(pkcsslotd_user)!g \ -e s!\@pkcs_group\@!$(pkcs_group)!g< $< > $@-t - $(foreach TOK,$(TOKENS),\ - echo "D $(lockdir)/$(TOK) 0770 root $(pkcs_group) -" >> $@-t;) mv $@-t $@ else initddir = $(sysconfdir)/rc.d/init.d