Commit 776056e2 776056e2e3e7529fc64ca30bf055646fd6f11a2a by Sergey Poznyakoff

Bugfixes

* libmailutils/server/acl.c (_run_entry): Fix log output.
* mu/shell.c: Fix compilation without readline.
1 parent 42d2ff71
...@@ -673,19 +673,15 @@ _run_entry (void *item, void *data) ...@@ -673,19 +673,15 @@ _run_entry (void *item, void *data)
673 char *s; 673 char *s;
674 if (ent->arg && expand_arg (ent->arg, rp, &s) == 0) 674 if (ent->arg && expand_arg (ent->arg, rp, &s) == 0)
675 { 675 {
676 if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9)) 676 mu_diag_output (MU_DIAG_INFO, "%s", s);
677 mu_debug_log_end ("%s", s);
678 free (s); 677 free (s);
679 } 678 }
680 else 679 else
681 { 680 {
682 if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
683 {
684 debug_sockaddr (rp->sa, rp->salen); 681 debug_sockaddr (rp->sa, rp->salen);
685 mu_debug_log_nl (); 682 mu_debug_log_nl ();
686 } 683 }
687 } 684 }
688 }
689 break; 685 break;
690 686
691 case mu_acl_exec: 687 case mu_acl_exec:
......
...@@ -412,13 +412,14 @@ shell_history (int argc, char **argv) ...@@ -412,13 +412,14 @@ shell_history (int argc, char **argv)
412 412
413 #else 413 #else
414 # define finish_readline() 414 # define finish_readline()
415 # define mutool_initialize_readline (const char *name) 415 # define mutool_initialize_readline(name)
416 416
417 char * 417 char *
418 readline (char *prompt) 418 readline (char *prompt)
419 { 419 {
420 static size_t size = 0; 420 static size_t size = 0;
421 static char *buf = NULL; 421 static char *buf = NULL;
422 size_t n;
422 423
423 if (prompt) 424 if (prompt)
424 { 425 {
......