mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
8c8d2c3d81
- No longer required to run pkcs11_startup. pkcs11_startup and pkcs_slotd were shell scripts that created the config file, pk_config_data, which was read by pkcsslotd to get available slot information. The pk_config_data configuration file has been replaced with /etc/opencryptoki/opencryptoki.conf. In version 3, the pkcsslotd daemon reads opencryptoki.conf to get slot information. The opencryptoki.conf by default contains slot information for each token currently supported by opencryptoki with the exception of the ICSF token, which requires some initial setup. Please see man page for opencryptoki.conf for further information. Since pk_config_data is no longer required, pkcs11_startup and pkcs_slotd have been removed.
41 lines
1 KiB
C
41 lines
1 KiB
C
--- usr/sbin/pkcsslotd/mutex.c.orig 2016-04-29 17:26:46 UTC
|
|
+++ usr/sbin/pkcsslotd/mutex.c
|
|
@@ -281,10 +281,28 @@
|
|
legal action under this Agreement more than one year after
|
|
the cause of action arose. Each party waives its rights to
|
|
a jury trial in any resulting litigation.
|
|
+*/
|
|
|
|
+#include <fcntl.h>
|
|
|
|
+#ifdef __sun
|
|
+#define LOCK_EX F_LOCK
|
|
+#define LOCK_UN F_ULOCK
|
|
+#define flock(fd, func) lockf(fd, func, 0)
|
|
+#endif
|
|
|
|
-*/
|
|
+#ifndef LOCK_SH
|
|
+#define LOCK_SH 1 /* shared lock */
|
|
+#endif
|
|
+#ifndef LOCK_EX
|
|
+#define LOCK_EX 2 /* exclusive lock */
|
|
+#endif
|
|
+#ifndef LOCK_NB
|
|
+#define LOCK_NB 4 /* don't block when locking */
|
|
+#endif
|
|
+#ifndef LOCK_UN
|
|
+#define LOCK_UN 8 /* unlock */
|
|
+#endif
|
|
|
|
/* (C) COPYRIGHT International Business Machines Corp. 2001 */
|
|
|
|
@@ -323,7 +341,7 @@ CreateXProcLock(void)
|
|
goto error;
|
|
}
|
|
|
|
- grp = getgrnam("pkcs11");
|
|
+ grp = getgrnam(PKCS11GROUP);
|
|
if (grp != NULL) {
|
|
if (fchown(xplfd,-1,grp->gr_gid) == -1) {
|
|
DbgLog(DL0,"%s:fchown(%s):%s\n",
|