Attachment #3638 for bug #3507

Lines 283-288 auth_rhosts2(struct passwd pw, const char client_user, const char *hostname, Link Here

(-)a/auth-rhosts.c (+1 lines)
283	xasprintf(&path, "%s/%s",	283	xasprintf(&path, "%s/%s",
284	pw->pw_dir, rhosts_files[rhosts_file_index]);	284	pw->pw_dir, rhosts_files[rhosts_file_index]);
285	if (stat(path, &st) == -1) {	285	if (stat(path, &st) == -1) {
		286	debug3_f("stat %s: %s", path, strerror(errno));
286	free(path);	287	free(path);
287	continue;	288	continue;
288	}	289	}




	va_list args;
	int r;

	if (auth_debug == NULL)
		return;

	va_start(args, fmt);
	vsnprintf(buf, sizeof(buf), fmt, args);
	va_end(args);
	debug3("%s", buf);
	if (auth_debug != NULL)
		if ((r = sshbuf_put_cstring(auth_debug, buf)) != 0)
			fatal_fr(r, "sshbuf_put_cstring");
}

void

Return to bug 3507

Lines 571-584 auth_debug_add(const char *fmt,...) Link Here

(-)a/auth.c (-5 / +4 lines)
571	va_list args;	571	va_list args;
572	int r;	572	int r;
573		573
574	if (auth_debug == NULL)
575	return;
576
577	va_start(args, fmt);	574	va_start(args, fmt);
578	vsnprintf(buf, sizeof(buf), fmt, args);	575	vsnprintf(buf, sizeof(buf), fmt, args);
579	va_end(args);	576	va_end(args);
580	if ((r = sshbuf_put_cstring(auth_debug, buf)) != 0)	577	debug3("%s", buf);
581	fatal_fr(r, "sshbuf_put_cstring");	578	if (auth_debug != NULL)
		579	if ((r = sshbuf_put_cstring(auth_debug, buf)) != 0)
		580	fatal_fr(r, "sshbuf_put_cstring");
582	}	581	}
583		582
584	void	583	void