Attachment 895 Details for Bug 6902 – patch

[patch] patch

cyrus-imapd-2.2.12-alt-serverversion-print-disable.patch (text/plain), 1.79 KB, created by algor on 2005-05-19 17:36:51 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: algor

Created: 2005-05-19 17:36:51 MSD

Size: 1.79 KB

patch

obsolete

>--- cyrus-imapd-2.2.12.orig/lib/imapoptions	2005-05-19 16:05:32 +0400
>+++ cyrus-imapd-2.2.12/lib/imapoptions	2005-05-19 16:23:54 +0400
>@@ -771,6 +771,9 @@ are listed with ``<none>''.
>    IMAP and LMTP daemons. If it is unset, then the result returned
>    from gethostname(2) is used. */
>    
>+{ "showserverver", 1, SWITCH }
>+/* Show or don't show server version in POP3 banner. */
>+
> { "sharedprefix", "Shared Folders", STRING }
> /* If using the alternate IMAP namespace, the prefix for the shared
>    namespace.  The hierarchy delimiter will be automatically appended. */
>
>--- cyrus-imapd-2.2.12.orig/imap/pop3d.c	2005-05-19 16:05:32 +0400
>+++ cyrus-imapd-2.2.12/imap/pop3d.c	2005-05-19 16:54:18 +0400
>@@ -425,9 +425,16 @@ int service_main(int argc __attribute__(
> 	syslog(LOG_WARNING, "APOP disabled: can't create challenge");
>     }
> 
>+    if (config_getswitch(IMAPOPT_SHOWSERVERVER)) {
>     prot_printf(popd_out, "+OK %s Cyrus POP3%s %s server ready %s\r\n",
> 		config_servername, config_mupdate_server ? " Murder" : "",
> 		CYRUS_VERSION, popd_apop_chal);
>+    }
>+    else {
>+    prot_printf(popd_out, "+OK %s Cyrus POP3%s server ready %s\r\n",
>+		config_servername, config_mupdate_server ? " Murder" : "",
>+		popd_apop_chal);
>+    }
>     cmdloop();
> 
>     /* QUIT executed */
>@@ -1205,11 +1212,18 @@ void cmd_capa()
> 	 || config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
> 	prot_printf(popd_out, "USER\r\n");
>     }
>-    
>+   
>+    if (config_getswitch(IMAPOPT_SHOWSERVERVER)) {
>     prot_printf(popd_out,
> 		"IMPLEMENTATION Cyrus POP3%s server %s\r\n",
> 		config_mupdate_server ? " Murder" : "", CYRUS_VERSION);
>-
>+    }
>+    else {	    
>+    prot_printf(popd_out,
>+		"IMPLEMENTATION Cyrus POP3%s server \r\n",
>+		config_mupdate_server ? " Murder" : "");
>+    }
>+    
>     prot_printf(popd_out, ".\r\n");
>     prot_flush(popd_out);
> }

Actions: View | Diff

Attachments on bug 6902: 895 | 896