diff -urNb qpopper4.0.5/common/logit.c qpopper4.0.5_simple/common/logit.c --- qpopper4.0.5/common/logit.c Wed Jan 1 21:39:02 2003 +++ qpopper4.0.5_simple/common/logit.c Fri Mar 21 15:09:13 2003 @@ -184,7 +184,6 @@ lMsec = (tval.tv_usec + 500) / 1000; /* convert useconds to milliseconds */ fprintf ( str, "%s.%03ld %.4s [%ld] %s\n", pDate, lMsec, pYear, (long) getpid(), msgbuf ); - fprintf ( str, "%s.%03ld %.4s \n", pDate, lMsec, pYear ); fflush ( str ); } else { diff -urNb qpopper4.0.5/popper/main.c qpopper4.0.5_simple/popper/main.c --- qpopper4.0.5/popper/main.c Wed Jan 1 21:39:02 2003 +++ qpopper4.0.5_simple/popper/main.c Fri Mar 21 15:09:14 2003 @@ -248,6 +248,8 @@ pname = ptr + 1; } + Qargv [ 0 ] = pname; + /* * The first specified parameter may be an IP address * and/or a port number. If so, this is what we bind @@ -305,7 +307,7 @@ err_dump ( HERE, "unable to allocate memory" ); Qargv_alloc = TRUE; bzero ( Qargv, rslt ); - Qargv [ 0 ] = argv [ 0 ]; + Qargv [ 0 ] = pname; for ( rslt = 2; rslt < argc; rslt++ ) Qargv [ rslt - 1 ] = argv [ rslt ]; Qargc = argc - 1; @@ -531,7 +533,7 @@ /* * Now we're ready to go */ - msg ( HERE, "listening on %s:%d\n", + msg ( HERE, "listening on %s:%d", inet_ntoa ( serv_addr.sin_addr ), ntohs ( serv_addr.sin_port ) ); @@ -610,7 +612,7 @@ newsockfd = accept ( sockfd, (struct sockaddr *) &cli_addr, &clilen ); TRACE ( trace_file, POP_DEBUG, HERE, - "accept=%d; sockfd=%d; clilen=%d; cli_addr=%s:%d\n", + "accept=%d; sockfd=%d; clilen=%d; cli_addr=%s:%d", newsockfd, sockfd, clilen, inet_ntoa ( cli_addr.sin_addr ), ntohs ( cli_addr.sin_port ) ); diff -urNb qpopper4.0.5/popper/pop_init.c qpopper4.0.5_simple/popper/pop_init.c --- qpopper4.0.5/popper/pop_init.c Wed Mar 12 21:06:37 2003 +++ qpopper4.0.5_simple/popper/pop_init.c Fri Mar 21 15:09:14 2003 @@ -663,6 +663,8 @@ #ifdef LOG_LOGIN p->pLog_login = "(v%0) POP login by user \"%1\" at (%2) %3"; +#else + p->pLog_login = NULL; #endif /* LOG_LOGIN */ StackInit ( & ( p->InProcess ) ); diff -urNb qpopper4.0.5/popper/pop_log.c qpopper4.0.5_simple/popper/pop_log.c --- qpopper4.0.5/popper/pop_log.c Wed Mar 12 21:06:37 2003 +++ qpopper4.0.5_simple/popper/pop_log.c Fri Mar 21 15:09:14 2003 @@ -138,7 +138,6 @@ lMsec = (tval.tv_usec + 500) / 1000; /* convert useconds to milliseconds */ fprintf ( p->trace, "%s.%03ld %.4s [%ld] %s\n", pDate, lMsec, pYear, (long) getpid(), msgbuf ); - fprintf ( p->trace, "%s.%03ld %.4s \n", pDate, lMsec, pYear ); fflush ( p->trace ); } else { diff -urNb qpopper4.0.5/popper/pop_pass.c qpopper4.0.5_simple/popper/pop_pass.c --- qpopper4.0.5/popper/pop_pass.c Wed Mar 12 21:06:37 2003 +++ qpopper4.0.5_simple/popper/pop_pass.c Fri Mar 21 15:09:14 2003 @@ -460,7 +460,7 @@ return ( pop_msg ( p, POP_FAILURE, HERE, GP_ERRSTRING, p->user, pam_strerror(NULL, erc), erc ) ); } - pamerror = pam_authenticate ( pamh, 0 ); + pamerror = pam_authenticate ( pamh, PAM_SILENT ); /* * Need to reopen log after calling pam_authenticate, since