From 49da288d5b0a62bd5cfc7ff61a9bd2604bc6e1d4 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 8 May 2021 17:48:02 +0200
Subject: [PATCH] Use BASE_NAME constant everywhere isntead of hard-coded name
---
src/config.rs | 6 ++++--
src/logging.rs | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/config.rs b/src/config.rs
index 3885dd4..9009b2d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -13,11 +13,13 @@
* limitations under the License.
*/
+use crate::BASE_NAME;
+
use serde::de::Deserialize;
extern crate config;
-const DEFAULT_CONFIG_FILE: &str = "/etc/nss_pam_oidc";
+const DEFAULT_CONFIG_FILE: &str = ("/etc/".to_string() + BASE_NAME).as_str();
pub fn get_config(conf_args: Option<config::Config>) -> config::Config {
// Preset default configuration
@@ -35,7 +37,7 @@ pub fn get_config(conf_args: Option<config::Config>) -> config::Config {
conf.merge(config::File::with_name(&config_file)).ok();
// Override configuration from environment variables
- conf.merge(config::Environment::with_prefix("NSS_PAM_OIDC")).ok();
+ conf.merge(config::Environment::with_prefix(BASE_NAME.to_string().to_uppercase().as_str())).ok();
// Override configuration from args passed on module loading (e.g. args in PAM stack)
conf.merge(conf_args).ok();
diff --git a/src/logging.rs b/src/logging.rs
index ba896db..e14d292 100644
--- a/src/logging.rs
+++ b/src/logging.rs
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+use crate::BASE_NAME;
+
use std::process;
use std::convert::TryInto;
@@ -24,7 +26,7 @@ pub fn setup_log(log_level: LevelFilter) {
let formatter = Formatter3164 {
facility: Facility::LOG_AUTHPRIV,
hostname: None,
- process: "nss_pam_oidc".into(),
+ process: BASE_NAME.into(),
pid: process::id().try_into().unwrap_or_default(),
};
let logger = syslog::unix(formatter).expect("could not connect to syslog");
--
GitLab