ports/73336: ports/qpopper X-UIDL handling not in line with documentation

[Helge Oldach]

>Number:         73336
>Category:       ports
>Synopsis:       ports/qpopper X-UIDL handling not in line with documentation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 31 09:40:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD localhost 4.10-STABLE FreeBSD 4.10-STABLE #2000: Sun Oct 24 13:07:42 CEST 2004 root@:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

According to the documentation, the update-status-headers configuration
option should disable both writing of "Status:" and "X-UIDL:" headers.
But only the first happens to be the case. "X-UIDL:" headers are written
to the mail store regardless of this setting.

The patch below fixes this behaviour.

	
>How-To-Repeat:
	
>Fix:

--- popper/pop_updt.c.ORIG	Thu Jan  2 03:39:03 2003
+++ popper/pop_updt.c	Sun Oct 31 10:09:30 2004
@@ -531,11 +531,13 @@
             if ( fputs ( buffer, md ) == EOF )
                 break;
 
-            sprintf ( buffer, "X-UIDL: %s", mp->uidl_str );
-            if ( fputs ( buffer, md ) == EOF )
-                break;
-            length += strlen ( buffer ) + 1; /* for CRLF */
-            lines  ++;
+            if ( p->bUpdate_status_hdrs ) {
+                sprintf ( buffer, "X-UIDL: %s", mp->uidl_str );
+                if ( fputs ( buffer, md ) == EOF )
+                    break;
+                length += strlen ( buffer ) + 1; /* for CRLF */
+                lines  ++;
+            }
 
             for ( status_written = 0, inheader = 1;
                   fgets ( buffer, MAXMSGLINELEN, p->drop );


>Release-Note:
>Audit-Trail:
>Unformatted: