From f5e1aaf86bb97d6d9712a7c313536546f5d39947 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Jun 05 2018 19:11:08 +0000
Subject: utils: move p11 child paths to util.h


To allow other responders to call p11_child too, some general defines
are moved to a common place.

Related to https://pagure.io/SSSD/sssd/issue/3489

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

---

diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c
index 8610b6b..94867a0 100644
--- a/src/responder/pam/pamsrv_cmd.c
+++ b/src/responder/pam/pamsrv_cmd.c
@@ -1308,7 +1308,6 @@ static errno_t check_cert(TALLOC_CTX *mctx,
                           struct pam_data *pd)
 {
     int p11_child_timeout;
-    const int P11_CHILD_TIMEOUT_DEFAULT = 10;
     char *cert_verification_opts;
     errno_t ret;
     struct tevent_req *req;
diff --git a/src/responder/pam/pamsrv_p11.c b/src/responder/pam/pamsrv_p11.c
index 0c9822f..0b6a162 100644
--- a/src/responder/pam/pamsrv_p11.c
+++ b/src/responder/pam/pamsrv_p11.c
@@ -30,12 +30,6 @@
 #include "util/crypto/sss_crypto.h"
 
 
-#ifndef SSSD_LIBEXEC_PATH
-#error "SSSD_LIBEXEC_PATH not defined"
-#endif  /* SSSD_LIBEXEC_PATH */
-
-#define P11_CHILD_LOG_FILE "p11_child"
-#define P11_CHILD_PATH SSSD_LIBEXEC_PATH"/p11_child"
 #define CERT_AUTH_DEFAULT_MATCHING_RULE "KRB5:<EKU>clientAuth"
 
 struct cert_auth_info {
diff --git a/src/util/util.h b/src/util/util.h
index ef8ef7f..4657ab0 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -710,4 +710,10 @@ int sss_create_dir(const char *parent_dir_path,
 int selinux_file_context(const char *dst_name);
 int reset_selinux_file_context(void);
 
+#ifdef SSSD_LIBEXEC_PATH
+#define P11_CHILD_LOG_FILE "p11_child"
+#define P11_CHILD_PATH SSSD_LIBEXEC_PATH"/p11_child"
+#define P11_CHILD_TIMEOUT_DEFAULT 10
+#endif  /* SSSD_LIBEXEC_PATH */
+
 #endif /* __SSSD_UTIL_H__ */