fix precedence error

[pam_pcsc_cr.git] / pam_pcsc_cr.c

diff --git a/pam_pcsc_cr.c b/pam_pcsc_cr.c
index 13a92e048253ef6abf5f4bfccbd8a46df3acba41..a43bd35d6460e562c60e866d7c251f08506364e7 100644 (file)
--- a/pam_pcsc_cr.c
+++ b/pam_pcsc_cr.c
@@ -1,3 +1,26 @@
+/*
+Copyright (c) 2013 Eugene Crosser
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment in the product documentation
+    would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -57,6 +80,7 @@ static void update_nonce(char *nonce, const int nonsize)
 struct _cfg {
        int noaskpass;
        int verbose;
+       int injectauth;
 };
 
 void parse_cfg(struct _cfg * const cfg, int argc, const char *argv[])
@@ -64,10 +88,14 @@ void parse_cfg(struct _cfg * const cfg, int argc, const char *argv[])
        int i;
 
        for (i = 0; i < argc; i++) {
+               if (cfg->verbose) syslog(LOG_DEBUG, "arg: \"%s\"", argv[i]);
                if (strchr(argv[i],':') && strchr(argv[i],'='))
                        pcsc_option(argv[i]);
                else if (!strcmp(argv[i], "verbose")) cfg->verbose = 1;
                else if (!strcmp(argv[i], "noaskpass")) cfg->noaskpass = 1;
+               else if (!strcmp(argv[i], "injectauth")) cfg->injectauth = 1;
+               else if (!strncmp(argv[i], "path=", 5))
+                                       authfile_template(argv[i]+5);
        }
 }
 
@@ -87,7 +115,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
        if ((pam_err = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) {
                if (cfg.verbose) syslog(LOG_ERR, "get_user failed: %s",
                                        pam_strerror(pamh, pam_err));
-               return (pam_err);
+               return pam_err;
        }
        if (strspn(user, "0123456789") == strlen(user)) {
                tokenid = user;
@@ -135,7 +163,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
        } else {
                if (!user)
                        pam_set_item(pamh, PAM_USER, ao.data);
-               if (ao.payload && ao.payload[0])
+               if (cfg.injectauth && ao.payload && ao.payload[0])
                        pam_set_item(pamh, PAM_AUTHTOK, ao.payload);
                return PAM_SUCCESS;
        }