diff --git a/proto/src/constants.rs b/proto/src/constants.rs index c91796b5c..7abe5ee2e 100644 --- a/proto/src/constants.rs +++ b/proto/src/constants.rs @@ -30,8 +30,7 @@ pub const DEFAULT_CLIENT_CONFIG_PATH_HOME: &str = "~/.config/kanidm"; /// The default HTTPS bind address for the Kanidm server pub const DEFAULT_SERVER_ADDRESS: &str = "127.0.0.1:8443"; pub const DEFAULT_SERVER_LOCALHOST: &str = "localhost:8443"; -/// The default LDAP bind address for the Kanidm server -pub const DEFAULT_LDAP_ADDRESS: &str = "127.0.0.1:636"; +/// The default LDAP bind address for the Kanidm client pub const DEFAULT_LDAP_LOCALHOST: &str = "localhost:636"; /// Default replication configuration pub const DEFAULT_REPLICATION_ADDRESS: &str = "127.0.0.1:8444"; diff --git a/server/core/src/config.rs b/server/core/src/config.rs index a10ad7ff1..b25adf58b 100644 --- a/server/core/src/config.rs +++ b/server/core/src/config.rs @@ -110,7 +110,9 @@ pub struct ServerConfig { pub bindaddress: Option, /// The listener address for the LDAP server. /// - /// eg. `[::]:3636` or `127.0.0.1:3636`. Defaults to [kanidm_proto::constants::DEFAULT_LDAP_ADDRESS] + /// eg. `[::]:3636` or `127.0.0.1:3636`. + /// + /// If unset, the LDAP server will be disabled. pub ldapbindaddress: Option, /// The role of this server, one of write_replica, write_replica_no_ui, read_only_replica diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs index e52da20b8..3102a99b3 100644 --- a/server/daemon/src/main.rs +++ b/server/daemon/src/main.rs @@ -230,7 +230,7 @@ fn main() -> ExitCode { // from attaching to us. #[cfg(all(target_os = "linux", not(debug_assertions)))] if let Err(code) = prctl::set_dumpable(false) { - eprintln!(?code, "CRITICAL: Unable to set prctl flags"); + error!(?code, "CRITICAL: Unable to set prctl flags"); return ExitCode::FAILURE; } diff --git a/unix_integration/src/daemon.rs b/unix_integration/src/daemon.rs index c0fe2012f..13ac2219f 100644 --- a/unix_integration/src/daemon.rs +++ b/unix_integration/src/daemon.rs @@ -511,7 +511,7 @@ async fn main() -> ExitCode { // from attaching to us. #[cfg(all(target_os = "linux", not(debug_assertions)))] if let Err(code) = prctl::set_dumpable(false) { - eprintln!(?code, "CRITICAL: Unable to set prctl flags"); + error!(?code, "CRITICAL: Unable to set prctl flags"); return ExitCode::FAILURE; }