openssh-3.0p1, auth2.c

[Hans Werner Strube]

openssh-3.0p1 still contains the bug which I already reported on Sept. 28 2001
for 2.9p2, namely, the trailing dot in chost should be stripped before calling
auth_rhosts2() even with option "HostbasedUsesNameFromPacketOnly yes".
Otherwise, the host names in /etc/hosts.equiv and .rhosts would have to be
dot-terminated. Fix: Move lines 776-779 of auth2.c upwards to after line 767.
(These line numbers also hold for 2.9.9p2.)

*** auth2.c.ORI	Wed Oct  3 19:12:44 2001
--- auth2.c	Fri Nov  9 10:15:42 2001
***************
*** 765,770 ****
--- 765,774 ----
  	resolvedname = get_canonical_hostname(options.reverse_mapping_check);
  	ipaddr = get_remote_ipaddr();
  
+ 	if (((len = strlen(chost)) > 0) && chost[len - 1] == '.') {
+ 		debug2("stripping trailing dot from chost %s", chost);
+ 		chost[len - 1] = '\0';
+ 	}
  	debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s",
  	    chost, resolvedname, ipaddr);
  
***************
*** 773,782 ****
  			return 0;
  		lookup = chost;
  	} else {
- 		if (((len = strlen(chost)) > 0) && chost[len - 1] == '.') {
- 			debug2("stripping trailing dot from chost %s", chost);
- 			chost[len - 1] = '\0';
- 		}
  		if (strcasecmp(resolvedname, chost) != 0)
  			log("userauth_hostbased mismatch: "
  			    "client sends %s, but we resolve %s to %s",
--- 777,782 ----