CVS commit: src/external/bsd/pam-u2f/dist

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Tue Mar  3 00:20:20 UTC 2020

Modified Files:
        src/external/bsd/pam-u2f/dist: util.c

Log Message:
define as empty when not debugging


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pam-u2f/dist/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/bsd/pam-u2f/dist/util.c
diff -u src/external/bsd/pam-u2f/dist/util.c:1.1.1.1 src/external/bsd/pam-u2f/dist/util.c:1.2
--- src/external/bsd/pam-u2f/dist/util.c:1.1.1.1	Mon Mar  2 19:18:44 2020
+++ src/external/bsd/pam-u2f/dist/util.c	Mon Mar  2 19:20:20 2020
@@ -236,7 +236,7 @@ int get_devices_from_authfile(const char
       *n_devs = 0;
 
       i = 0;
-      while ((s_token = strtok_r(NULL, ",", &saveptr))) {
+      while ((s_token = strtok_r(NULL, ",", &saveptr)) != NULL) {
         if ((*n_devs)++ > max_devs - 1) {
           *n_devs = max_devs;
           if (verbose)
@@ -1131,7 +1131,7 @@ static int _converse(pam_handle_t *pamh,
 
 char *converse(pam_handle_t *pamh, int echocode, const char *prompt) {
   const struct pam_message msg = {.msg_style = echocode,
-                                  .msg = (char *) prompt};
+                                  .msg = (char *)(uintptr_t)prompt};
   const struct pam_message *msgs = &msg;
   struct pam_response *resp = NULL;
   int retval = _converse(pamh, 1, &msgs, &resp);
@@ -1163,10 +1163,10 @@ void _debug(FILE *debug_file, const char
             const char *fmt, ...) {
   va_list ap;
   va_start(ap, fmt);
-#ifdef __linux__
+#ifdef LOG_DEBUG
   if (debug_file == (FILE *) -1) {
-    syslog(LOG_AUTHPRIV | LOG_DEBUG, DEBUG_STR, file, line, func);
-    vsyslog(LOG_AUTHPRIV | LOG_DEBUG, fmt, ap);
+    syslog(LOG_AUTHPRIV | LOG_ERR, DEBUG_STR, file, line, func);
+    vsyslog(LOG_AUTHPRIV | LOG_ERR, fmt, ap);
   } else {
     fprintf(debug_file, DEBUG_STR, file, line, func);
     vfprintf(debug_file, fmt, ap);