Remove most uses of build.rs

Author: bjorn3

build.rs

@@ -1,30 +1,14 @@
-use std::path::Path;
-
-// Return the first existing path given a list of paths as string slices
-fn get_first_path(paths: &[&'static str]) -> Option<&'static str> {
-    paths.iter().find(|p| Path::new(p).exists()).copied()
-}
-
 fn main() {
-    let path_zoneinfo: &str = get_first_path(&[
+    let path_zoneinfo = [
         "/usr/share/zoneinfo",
         "/usr/share/lib/zoneinfo",
         "/usr/lib/zoneinfo",
         "/usr/lib/zoneinfo",
-    ])
+    ]
+    .into_iter()
+    .find(|p| std::path::Path::new(p).exists())
     .expect("no zoneinfo database");
 
-    // TODO: use _PATH_STDPATH and _PATH_DEFPATH_ROOT from paths.h
-    println!("cargo:rustc-env=SUDO_PATH_DEFAULT=/usr/bin:/bin:/usr/sbin:/sbin");
-    println!(
-        "cargo:rustc-env=SU_PATH_DEFAULT_ROOT=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-    );
-    println!(
-        "cargo:rustc-env=SU_PATH_DEFAULT=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
-    );
-
     println!("cargo:rustc-env=PATH_ZONEINFO={path_zoneinfo}");
     println!("cargo:rerun-if-changed=build.rs");
-
-    println!("cargo:rustc-link-lib=pam");
 }

src/pam/mod.rs

@@ -25,6 +25,9 @@ mod securemem;
 #[allow(nonstandard_style)]
 pub mod sys;
 
+#[link(name = "pam")]
+extern "C" {}
+
 #[cfg(target_os = "freebsd")]
 const PAM_DATA_SILENT: std::ffi::c_int = 0;
 

src/su/context.rs

@@ -19,8 +19,9 @@ use super::cli::SuRunOptions;
 const VALID_LOGIN_SHELLS_LIST: &str = "/etc/shells";
 const FALLBACK_LOGIN_SHELL: &str = "/bin/sh";
 
-const PATH_DEFAULT: &str = env!("SU_PATH_DEFAULT");
-const PATH_DEFAULT_ROOT: &str = env!("SU_PATH_DEFAULT_ROOT");
+// TODO: use _PATH_STDPATH and _PATH_DEFPATH_ROOT from paths.h
+const PATH_DEFAULT: &str = "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games";
+const PATH_DEFAULT_ROOT: &str = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
 
 #[derive(Debug)]
 pub(crate) struct SuContext {

src/sudo/env/environment.rs

@@ -11,7 +11,8 @@ use crate::system::PATH_MAX;
 use super::wildcard_match::wildcard_match;
 
 const PATH_ZONEINFO: &str = env!("PATH_ZONEINFO");
-const PATH_DEFAULT: &str = env!("SUDO_PATH_DEFAULT");
+// TODO: use _PATH_STDPATH from paths.h
+pub(crate) const PATH_DEFAULT: &str = "/usr/bin:/bin:/usr/sbin:/sbin";
 
 pub type Environment = HashMap<OsString, OsString>;
 

src/sudo/mod.rs

@@ -19,6 +19,7 @@ mod edit;
 
 pub(crate) mod diagnostic;
 mod env;
+pub(crate) use env::environment::PATH_DEFAULT;
 mod pam;
 mod pipeline;
 

src/sudoers/mod.rs

@@ -321,7 +321,7 @@ fn select_editor(settings: &Settings, trusted_env: bool) -> PathBuf {
                 editor
             } else if let Some(editor) = resolve_path(
                 &editor,
-                &std::env::var("PATH").unwrap_or(env!("SUDO_PATH_DEFAULT").to_string()),
+                &std::env::var("PATH").unwrap_or(crate::sudo::PATH_DEFAULT.to_string()),
             ) {
                 editor
             } else {