summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsp149894 <none@none>2006-10-04 23:03:18 -0700
committersp149894 <none@none>2006-10-04 23:03:18 -0700
commitb760ebbf2958f42920969bccd6ccab1b129076a8 (patch)
tree45d65c401a3a7beaa9c20a2e77ae273bfefbf1ae
parentdd6707ee8afdf64b1b56df26e281c5c8b0a9af32 (diff)
downloadillumos-gate-b760ebbf2958f42920969bccd6ccab1b129076a8.tar.gz
6460452 rexec() on x86 doesn't work - port sent to client for error "channel" incorrect
-rw-r--r--usr/src/lib/libsocket/inet/rexec.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/usr/src/lib/libsocket/inet/rexec.c b/usr/src/lib/libsocket/inet/rexec.c
index b663fa2523..09ce6fe49d 100644
--- a/usr/src/lib/libsocket/inet/rexec.c
+++ b/usr/src/lib/libsocket/inet/rexec.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -144,9 +143,9 @@ retry:
goto bad;
}
if (res->ai_family == AF_INET6) {
- port = ((struct sockaddr_in6 *)&sin2)->sin6_port;
+ port = ntohs(((struct sockaddr_in6 *)&sin2)->sin6_port);
} else {
- port = ((struct sockaddr_in *)&sin2)->sin_port;
+ port = ntohs(((struct sockaddr_in *)&sin2)->sin_port);
}
(void) snprintf(aport, MAX_SHORTSTRLEN, "%u", port);
(void) write(s, aport, strlen(aport)+1);