diff -urNb qpopper4.0.5/common/logit.c qpopper4.0.5g26/common/logit.c
--- qpopper4.0.5/common/logit.c	Wed Mar 26 14:25:21 2003
+++ qpopper4.0.5g26/common/logit.c	Fri Mar 21 11:19:43 2003
@@ -182,8 +182,11 @@
         pYear     = pDate + ( iDateLen - 5 ); /* point to start of year */
         date_time [ iDateLen - 2 ] = '\0'; /* cut off the year */
         lMsec     = (tval.tv_usec + 500) / 1000; /* convert useconds to milliseconds */
-        fprintf ( str, "%s.%03ld %.4s [%ld] %s\n", 
+        fprintf ( str, "%s.%03ld %.4s %ld %s\n", 
                   pDate, lMsec, pYear, (long) getpid(), msgbuf );
+	/* 20020306 grg deleted extra line
+        fprintf ( str, "%s.%03ld %.4s \n", pDate, lMsec, pYear );
+	*/
         fflush  ( str );
     }
     else {
diff -urNb qpopper4.0.5/popper/main.c qpopper4.0.5g26/popper/main.c
--- qpopper4.0.5/popper/main.c	Wed Mar 26 14:25:47 2003
+++ qpopper4.0.5g26/popper/main.c	Fri Mar 21 11:19:44 2003
@@ -261,7 +261,7 @@
             pname = ptr + 1;
     }
 
-    Qargv [ 0 ] = pname; 
+    Qargv [ 0 ] = pname;   /* originally argv [ 0 ]  dcg for ecc */
 
     /*
      * The first specified parameter may be an IP address
@@ -320,7 +320,7 @@
             err_dump ( HERE, "unable to allocate memory" );
         Qargv_alloc = TRUE;
         bzero ( Qargv, rslt );
-        Qargv [ 0 ] = pname;
+        Qargv [ 0 ] = pname;   /* originally argv [ 0 ]  dcg for ecc */
         for ( rslt = 2; rslt < argc; rslt++ )
             Qargv [ rslt - 1 ] = argv [ rslt ];
         Qargc = argc - 1;
@@ -351,7 +351,7 @@
                 logfile_name = strdup ( optarg );
                 logfile_file = fopen ( optarg, "a" );
                 if ( logfile_file == NULL )
-                    err_dump ( HERE, "Unable to open log file \"%s\"", optarg );
+                    err_dump ( HERE, "Unable to open trace file \"%s\"", optarg );
                 TRACE ( trace_file, POP_DEBUG, HERE,
                         "Opened log file \"%s\" as %d",
                         logfile_name, fileno(logfile_file) );
@@ -590,6 +590,11 @@
     /*
      * Now we're ready to go
      */
+    /* 20020306 grg deleted extra newline
+    msg ( HERE, "listening on %s:%d\n",
+          inet_ntoa ( serv_addr.sin_addr ),
+          ntohs     ( serv_addr.sin_port ) );
+    */
     msg ( HERE, "listening on %s:%d",
           inet_ntoa ( serv_addr.sin_addr ),
           ntohs     ( serv_addr.sin_port ) );
@@ -692,6 +697,9 @@
         newsockfd = accept ( sockfd, (struct sockaddr *) &cli_addr, &clilen );
 
         TRACE ( trace_file, POP_DEBUG, HERE, 
+		/* 20020305 grg delete extra newline
+                "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 ),
@@ -1017,11 +1025,11 @@
     {
         if (S_ISDIR(filestat.st_mode))
         {   /* a directory means that we must supply the filename */
-            strncpy(result,file_guess,122);
+            strncpy(result,file_guess,110);
             strcat(result,"/");
                 if (strstr(file_guess,pname) == NULL)
                 {
-                        strncat(result,pname,127-(strlen(file_guess)-4) );
+                        strcat(result,pname);
                         strcat(result,".pid");
                 }
                 else
@@ -1038,10 +1046,10 @@
             {
                 strcpy(result,PIDFILEDIR);
                 strcat(result,"/");
-                strncat(result,file_guess,126-strlen(PIDFILEDIR));
+                strncat(result,file_guess,512);
             }
             else
-                strncpy(result,file_guess,127);
+                strcpy(result,file_guess);
         }
         else
             error = 1;
diff -urNb qpopper4.0.5/popper/pop_get_command.c qpopper4.0.5g26/popper/pop_get_command.c
--- qpopper4.0.5/popper/pop_get_command.c	Wed Mar 26 14:25:47 2003
+++ qpopper4.0.5g26/popper/pop_get_command.c	Fri Mar 21 11:19:44 2003
@@ -106,6 +106,9 @@
         }
     }
 
+    /*
+     * We want these logged into the log file
+     */
     if ( p->logfile ) {
         if ( strcmp ( p->pop_command, "pass" ) == 0 )
             logit ( p->logfile, POP_DEBUG, HERE,
diff -urNb qpopper4.0.5/popper/pop_init.c qpopper4.0.5g26/popper/pop_init.c
--- qpopper4.0.5/popper/pop_init.c	Wed Mar 26 14:25:40 2003
+++ qpopper4.0.5g26/popper/pop_init.c	Fri Mar 21 11:19:44 2003
@@ -1114,9 +1114,11 @@
          */
         ch = gethostbyaddr ( (char *) &cs.sin_addr, sizeof(cs.sin_addr), AF_INET );
         if ( ch == NULL ) {
+#if 0   /* we don't care */
             pop_log ( p, POP_DEBUG, HERE,
                       "(v%s) Unable to get canonical name of client %s: %s (%d)",
                       VERSION, p->ipaddr, hstrerror(h_errno), h_errno );
+#endif
             p->client = p->ipaddr;
         }
         /*  
diff -urNb qpopper4.0.5/popper/pop_log.c qpopper4.0.5g26/popper/pop_log.c
--- qpopper4.0.5/popper/pop_log.c	Wed Mar 26 14:25:22 2003
+++ qpopper4.0.5g26/popper/pop_log.c	Fri Mar 21 11:19:44 2003
@@ -138,6 +138,9 @@
         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 );
+	/* 20020304 grg delete extra line on every log message
+        fprintf ( p->trace, "%s.%03ld %.4s XXXX\n", pDate, lMsec, pYear );
+	*/
         fflush  ( p->trace );
     }
     else {
diff -urNb qpopper4.0.5/popper/version.h qpopper4.0.5g26/popper/version.h
--- qpopper4.0.5/popper/version.h	Wed Mar 12 21:06:38 2003
+++ qpopper4.0.5g26/popper/version.h	Fri Mar 21 11:27:23 2003
@@ -13,7 +13,7 @@
  *  Current version of Qpopper
  */
 
-#define VERS_NUM          "4.0.5"
+#define VERS_NUM          "4.0.5g26"
 
 #ifdef KERBEROS
 #  ifdef KRB4