From 90f02991e4e09d538cf65967d605a7679f6d7696 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Wed, 1 Nov 2006 16:53:38 +0000
Subject: [PATCH] .pamusb -> .pusb /etc/pamusb -> /etc/pusb

---
 pam_usb/src/conf.c         | 4 ++--
 pam_usb/src/conf.h         | 2 +-
 pam_usb/tools/pusb_adm     | 2 +-
 pam_usb/tools/pusb_hotplug | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pam_usb/src/conf.c b/pam_usb/src/conf.c
index 3ece8e8..72fcf7b 100644
--- a/pam_usb/src/conf.c
+++ b/pam_usb/src/conf.c
@@ -130,8 +130,8 @@ int	pusb_conf_init(t_pusb_options *opts)
       log_error("gethostname: %s\n", strerror(errno));
       return (0);
     }
-  strcpy(opts->system_pad_directory, ".pamusb");
-  strcpy(opts->device_pad_directory, ".pamusb");
+  strcpy(opts->system_pad_directory, ".pusb");
+  strcpy(opts->device_pad_directory, ".pusb");
   opts->probe_timeout = 10;
   opts->enable = 1;
   opts->debug = 0;
diff --git a/pam_usb/src/conf.h b/pam_usb/src/conf.h
index 65530a9..31c2093 100644
--- a/pam_usb/src/conf.h
+++ b/pam_usb/src/conf.h
@@ -17,7 +17,7 @@
 
 #ifndef PUSB_CONF_H_
 # define PUSB_CONF_H_
-# define PUSB_CONF_FILE "/etc/pamusb/pusb.conf"
+# define PUSB_CONF_FILE "/etc/pusb/pusb.conf"
 # define CONF_DEVICE_XPATH "//configuration/devices/device[@id='%s']/%s"
 # define CONF_USER_XPATH "//configuration/users/user[@id='%s']/%s"
 # define CONF_SERVICE_XPATH "//configuration/services/service[@id='%s']/%s"
diff --git a/pam_usb/tools/pusb_adm b/pam_usb/tools/pusb_adm
index 1c616d1..da3889a 100755
--- a/pam_usb/tools/pusb_adm
+++ b/pam_usb/tools/pusb_adm
@@ -151,7 +151,7 @@ if len(args) != 0:
     usage()
 
 options = { 'force' : False, 'deviceName' : None,
-            'configFile' : '/etc/pamusb/pusb.conf' }
+            'configFile' : '/etc/pusb/pusb.conf' }
 
 for o, a in opts:
     if o in ("-h", "--help"):
diff --git a/pam_usb/tools/pusb_hotplug b/pam_usb/tools/pusb_hotplug
index 9419cb7..b1c7ebc 100755
--- a/pam_usb/tools/pusb_hotplug
+++ b/pam_usb/tools/pusb_hotplug
@@ -114,7 +114,7 @@ try:
 except getopt.GetoptError:
     usage()
 
-options = {'configFile' : '/etc/pamusb/pusb.conf',
+options = {'configFile' : '/etc/pusb/pusb.conf',
             'daemon' : False,
             'path' : '/usr/bin/pusb_check'}