From 8134df29b7216cb07feef3532e8696eb3f5afd67 Mon Sep 17 00:00:00 2001
From: Barry Pederson <barry.pederson@und.edu>
Date: Tue, 1 Mar 2022 10:23:17 -0800
Subject: [PATCH] Change option names for clarity

---
 src/listener.rs | 12 ++++++------
 src/options.rs  |  7 ++++---
 src/server.rs   |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/listener.rs b/src/listener.rs
index 336985d..931d96b 100644
--- a/src/listener.rs
+++ b/src/listener.rs
@@ -13,15 +13,15 @@ pub struct Listener {
 
 impl Listener {
     pub fn new() -> Result<Listener, Error> {
-        if OPTIONS.socket.exists() {
-            std::fs::remove_file(&OPTIONS.socket)?;
+        if OPTIONS.socket_name.exists() {
+            std::fs::remove_file(&OPTIONS.socket_name)?;
         }
 
-        let listener = UnixListener::bind(&OPTIONS.socket)?;
+        let listener = UnixListener::bind(&OPTIONS.socket_name)?;
 
-        let mut perms = metadata(&OPTIONS.socket)?.permissions();
+        let mut perms = metadata(&OPTIONS.socket_name)?.permissions();
         perms.set_mode(0o0777);
-        set_permissions(&OPTIONS.socket, perms)?;
+        set_permissions(&OPTIONS.socket_name, perms)?;
 
         Ok(Listener { listener })
     }
@@ -46,7 +46,7 @@ impl Listener {
 
 impl Drop for Listener {
     fn drop(&mut self) {
-        let _result = std::fs::remove_file(&OPTIONS.socket);
+        let _result = std::fs::remove_file(&OPTIONS.socket_name);
         println!("Shutting down");
     }
 }
diff --git a/src/options.rs b/src/options.rs
index 2677da3..2776db5 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -1,5 +1,6 @@
-use once_cell::sync::Lazy;
 use std::path::PathBuf;
+
+use once_cell::sync::Lazy;
 use structopt::StructOpt;
 
 #[derive(StructOpt, Clone, Debug)]
@@ -12,7 +13,7 @@ pub struct Opt {
         default_value = "/tmp/saslauthd.sock",
         parse(from_os_str)
     )]
-    pub socket: PathBuf,
+    pub socket_name: PathBuf,
 
     #[structopt(
         short = "p",
@@ -20,7 +21,7 @@ pub struct Opt {
         default_value = "./passwords",
         parse(from_os_str)
     )]
-    pub passwords: PathBuf,
+    pub password_dir: PathBuf,
 }
 
 pub static OPTIONS: Lazy<Opt> = Lazy::new(Opt::from_args);
diff --git a/src/server.rs b/src/server.rs
index 874d491..9943bda 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -59,7 +59,7 @@ impl Server {
             return Ok(false);
         }
 
-        let mut password_file = OPTIONS.passwords.clone();
+        let mut password_file = OPTIONS.password_dir.clone();
         password_file.push(&userid);
 
         let file = File::open(password_file)?;