fix precedence error

diff --git a/authfile.c b/authfile.c
index 2d30ed83b1ed708736e3d4a4f66a350e35aee8dd..923cb8824fb31db39089e451edb95120de02d780 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -74,7 +74,7 @@ static int path_size(const char *tokenid, const char *userid)
        } else {
                usub = userid;
        }
-       return strlen(template) + p?strlen(usub):0 + q?strlen(tokenid):0 + 1;
+       return strlen(template)+(p?strlen(usub):0)+(q?strlen(tokenid):0)+1;
 }
 
 static void

diff --git a/pam_pcsc_cr.c b/pam_pcsc_cr.c
index 7dffd4d3673ca9af0be532dc6e475072cd8078b4..a43bd35d6460e562c60e866d7c251f08506364e7 100644 (file)
--- a/pam_pcsc_cr.c
+++ b/pam_pcsc_cr.c
@@ -88,6 +88,7 @@ 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;