Attachment #895 for bug #6902

View | Details | Raw Unified | Return to bug 6902
Collapse All | Expand All

Lines 771-776 are listed with ``<none>''. Link Here

(-)cyrus-imapd-2.2.12.orig/lib/imapoptions (+3 lines)
771	IMAP and LMTP daemons. If it is unset, then the result returned	771	IMAP and LMTP daemons. If it is unset, then the result returned
772	from gethostname(2) is used. */	772	from gethostname(2) is used. */
773		773
		774	{ "showserverver", 1, SWITCH }
		775	/* Show or don't show server version in POP3 banner. */
		776
774	{ "sharedprefix", "Shared Folders", STRING }	777	{ "sharedprefix", "Shared Folders", STRING }
775	/* If using the alternate IMAP namespace, the prefix for the shared	778	/* If using the alternate IMAP namespace, the prefix for the shared
776	namespace. The hierarchy delimiter will be automatically appended. */	779	namespace. The hierarchy delimiter will be automatically appended. */




	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 */

	 || 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);
}

Return to bug 6902

Lines 425-433 int service_main(int argc __attribute__( Link Here

(-)cyrus-imapd-2.2.12.orig/imap/pop3d.c (-2 / +16 lines)
425	syslog(LOG_WARNING, "APOP disabled: can't create challenge");	425	syslog(LOG_WARNING, "APOP disabled: can't create challenge");
426	}	426	}
427		427
		428	if (config_getswitch(IMAPOPT_SHOWSERVERVER)) {
428	prot_printf(popd_out, "+OK %s Cyrus POP3%s %s server ready %s\r\n",	429	prot_printf(popd_out, "+OK %s Cyrus POP3%s %s server ready %s\r\n",
429	config_servername, config_mupdate_server ? " Murder" : "",	430	config_servername, config_mupdate_server ? " Murder" : "",
430	CYRUS_VERSION, popd_apop_chal);	431	CYRUS_VERSION, popd_apop_chal);
		432	}
		433	else {
		434	prot_printf(popd_out, "+OK %s Cyrus POP3%s server ready %s\r\n",
		435	config_servername, config_mupdate_server ? " Murder" : "",
		436	popd_apop_chal);
		437	}
431	cmdloop();	438	cmdloop();
432		439
433	/* QUIT executed */	440	/* QUIT executed */
Lines 1205-1215 void cmd_capa() Link Here
1205	\|\| config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {	1212	\|\| config_getswitch(IMAPOPT_ALLOWPLAINTEXT))) {
1206	prot_printf(popd_out, "USER\r\n");	1213	prot_printf(popd_out, "USER\r\n");
1207	}	1214	}
1208		1215
		1216	if (config_getswitch(IMAPOPT_SHOWSERVERVER)) {
1209	prot_printf(popd_out,	1217	prot_printf(popd_out,
1210	"IMPLEMENTATION Cyrus POP3%s server %s\r\n",	1218	"IMPLEMENTATION Cyrus POP3%s server %s\r\n",
1211	config_mupdate_server ? " Murder" : "", CYRUS_VERSION);	1219	config_mupdate_server ? " Murder" : "", CYRUS_VERSION);
1212		1220	}
		1221	else {
		1222	prot_printf(popd_out,
		1223	"IMPLEMENTATION Cyrus POP3%s server \r\n",
		1224	config_mupdate_server ? " Murder" : "");
		1225	}
		1226
1213	prot_printf(popd_out, ".\r\n");	1227	prot_printf(popd_out, ".\r\n");
1214	prot_flush(popd_out);	1228	prot_flush(popd_out);
1215	}	1229	}