Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 673986 | Differences between
and this patch

Collapse All | Expand All

(-)a/sendmail/usersmtp.c (-2 / +7 lines)
Lines 1331-1339 safesaslfile(context, file) Link Here
1331
{
1331
{
1332
	long sff;
1332
	long sff;
1333
	int r;
1333
	int r;
1334
#if SASL <= 10515
1335
	size_t len;
1334
	size_t len;
1336
#endif /* SASL <= 10515 */
1337
	char *p;
1335
	char *p;
1338
1336
1339
	if (file == NULL || *file == '\0')
1337
	if (file == NULL || *file == '\0')
Lines 1369-1377 safesaslfile(context, file) Link Here
1369
#endif /* SASL <= 10515 */
1367
#endif /* SASL <= 10515 */
1370
1368
1371
	p = (char *) file;
1369
	p = (char *) file;
1370
	len = strlen(p);
1372
	if ((r = safefile(p, RunAsUid, RunAsGid, RunAsUserName, sff,
1371
	if ((r = safefile(p, RunAsUid, RunAsGid, RunAsUserName, sff,
1373
			  S_IRUSR, NULL)) == 0)
1372
			  S_IRUSR, NULL)) == 0)
1374
		return SASL_OK;
1373
		return SASL_OK;
1374
#if SASL > 10515
1375
	/* Expect /usr/lib/sasl2/Sendmail.conf to be missing - config now in /etc/sasl2 */
1376
	if (type == SASL_VRFY_CONF && r == ENOENT &&
1377
            len >= 8 && strncmp(p, "/usr/lib", 8) == 0)
1378
		return SASL_CONTINUE;
1379
#endif /* SASL > 10515 */
1375
	if (LogLevel > (r != ENOENT ? 8 : 10))
1380
	if (LogLevel > (r != ENOENT ? 8 : 10))
1376
		sm_syslog(LOG_WARNING, NOQID, "error: safesasl(%s) failed: %s",
1381
		sm_syslog(LOG_WARNING, NOQID, "error: safesasl(%s) failed: %s",
1377
			  p, sm_errstring(r));
1382
			  p, sm_errstring(r));

Return to bug 673986