[Pcsclite-cvs-commit] MusclePAM certutils.h,1.3,1.4 pam-muscle.conf,1.2,1.3 preferences.c,1.3,1.4

rousseau@quantz.debian.org rousseau@quantz.debian.org
Fri, 03 Oct 2003 21:30:33 +0200


Update of /cvsroot/muscleapps/MusclePAM
In directory quantz:/tmp/cvs-serv1619

Modified Files:
	certutils.h pam-muscle.conf preferences.c 
Log Message:
get config files from /etc/musclepam/ instead of /etc/


Index: certutils.h
===================================================================
RCS file: /cvsroot/muscleapps/MusclePAM/certutils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- certutils.h	2 Oct 2003 19:29:48 -0000	1.3
+++ certutils.h	3 Oct 2003 19:30:31 -0000	1.4
@@ -16,7 +16,7 @@
 
 #define MSC_KEY_SIZE 128
 #define RANDOM_DEVICE "/dev/urandom"
-#define PUBMSC_KEY_FILE   "/etc/pubkey"
+#define PUBMSC_KEY_FILE   "/etc/musclepam/pubkey"
 
 /**
  * Generates a random number of size len.

Index: pam-muscle.conf
===================================================================
RCS file: /cvsroot/muscleapps/MusclePAM/pam-muscle.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pam-muscle.conf	11 Jul 2002 21:12:25 -0000	1.2
+++ pam-muscle.conf	3 Oct 2003 19:30:31 -0000	1.3
@@ -1,18 +1,17 @@
 #
-# PAM smartcard sample config file (/etc/pam-muscle.conf).  All of these 
-# options are optional.  They will default to these values if no rc file 
-# is found.
+# PAM smartcard sample config file (/etc/musclepam/pam-muscle.conf).
+# All of these options are optional.  They will default to these values
+# if no rc file is found.
 #
 
-Debug                  = OFF              # Debug ON or OFF
-CertNumber             = 0                # Certificate number to use
-PinNumber              = 1                # Pin number to verify
-UserPath               = /home/           # Path to user home directory
-CertName               = user.cert        # User Certificate in DER format
-RootCACert             = /etc/root.cert   # Root CA certificate
-LDAPHost               = unsupported      # Web-server with LDAP
-LDAPPath               = unsupported      # Search path in LDAP
-AuthMode               = UserCert         # RootCert or UserCert - se README
-
+Debug       = OFF                       # Debug ON or OFF
+CertNumber  = 0                         # Certificate number to use
+PinNumber   = 1                         # Pin number to verify
+UserPath    = /home/                    # Path to user home directory
+CertName    = user.cert                 # User Certificate in DER format
+RootCACert  = /etc/musclepam/root.cert  # Root CA certificate
+LDAPHost    = unsupported               # Web-server with LDAP
+LDAPPath    = unsupported               # Search path in LDAP
+AuthMode    = UserCert                  # RootCert or UserCert - see README
 
 # End

Index: preferences.c
===================================================================
RCS file: /cvsroot/muscleapps/MusclePAM/preferences.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- preferences.c	1 Oct 2002 17:17:58 -0000	1.3
+++ preferences.c	3 Oct 2003 19:30:31 -0000	1.4
@@ -28,7 +28,7 @@
   1,
   "/home/",
   "user.cert",
-  "/etc/root.cert",
+  "/etc/musclepam/root.cert",
   "",
   "",
   ROOTCERT
@@ -191,7 +191,7 @@
 {
   int rv = 0;
   FILE *fp;
-  char rcfilename[] = "/etc/pam-muscle.conf";
+  char rcfilename[] = "/etc/musclepam/pam-muscle.conf";
   char buf[1024];
   
 
@@ -205,12 +205,4 @@
     }
   return rv;
 }
-
-
-
-
-
-
-
-