* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <stdio.h>
#include <netdb.h>
#include <errno.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/uio.h>
int rexecoptions;
+libc_freeres_ptr (static char *ahostbuf);
int
-rexec(ahost, rport, name, pass, cmd, fd2p)
- char **ahost;
- int rport;
- const char *name, *pass, *cmd;
- int *fd2p;
+rexec_af (char **ahost, int rport, const char *name, const char *pass,
+ const char *cmd, int *fd2p, sa_family_t af)
{
- struct sockaddr_in sin, sin2, from;
- struct hostent hostbuf, *hp;
- size_t hstbuflen;
- char *hsttmpbuf;
- u_short port;
+ struct sockaddr_storage from;
+ struct addrinfo hints, *res0;
+ const char *orig_name = name;
+ const char *orig_pass = pass;
+ u_short port = 0;
int s, timo = 1, s3;
char c;
- int herr;
+ int gai;
+ char servbuff[NI_MAXSERV];
+
+ __snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport));
+ servbuff[sizeof(servbuff) - 1] = '\0';
- hstbuflen = 1024;
- hsttmpbuf = __alloca (hstbuflen);
- while (__gethostbyname_r (*ahost, &hostbuf, hsttmpbuf, hstbuflen,
- &hp, &herr) < 0)
- if (herr != NETDB_INTERNAL || errno != ERANGE)
- {
- __set_h_errno (herr);
- herror(*ahost);
- return -1;
- }
- else
- {
- /* Enlarge the buffer. */
- hstbuflen *= 2;
- hsttmpbuf = __alloca (hstbuflen);
- }
+ memset(&hints, '\0', sizeof(hints));
+ hints.ai_family = af;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_CANONNAME;
+ gai = getaddrinfo(*ahost, servbuff, &hints, &res0);
+ if (gai){
+ /* XXX: set errno? */
+ return -1;
+ }
- *ahost = hp->h_name;
- ruserpass(hp->h_name, &name, &pass);
+ if (res0->ai_canonname){
+ free (ahostbuf);
+ ahostbuf = __strdup (res0->ai_canonname);
+ if (ahostbuf == NULL) {
+ perror ("rexec: strdup");
+ return (-1);
+ }
+ *ahost = ahostbuf;
+ } else {
+ *ahost = NULL;
+ __set_errno (ENOENT);
+ return -1;
+ }
+ ruserpass(res0->ai_canonname, &name, &pass);
retry:
- s = __socket(AF_INET, SOCK_STREAM, 0);
+ /* NB: No SOCK_CLOEXEC for backwards compatibility. */
+ s = __socket(res0->ai_family, res0->ai_socktype, 0);
if (s < 0) {
perror("rexec: socket");
return (-1);
}
- sin.sin_family = hp->h_addrtype;
- sin.sin_port = rport;
- bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
- if (__connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+ if (__connect(s, res0->ai_addr, res0->ai_addrlen) < 0) {
if (errno == ECONNREFUSED && timo <= 16) {
(void) __close(s);
__sleep(timo);
timo *= 2;
goto retry;
}
- perror(hp->h_name);
+ perror(res0->ai_canonname);
return (-1);
}
if (fd2p == 0) {
port = 0;
} else {
char num[32];
- int s2, sin2len;
+ int s2;
+ union
+ {
+ struct sockaddr_storage ss;
+ struct sockaddr sa;
+ } sa2;
+ socklen_t sa2len;
- s2 = __socket(AF_INET, SOCK_STREAM, 0);
+ s2 = __socket(res0->ai_family, res0->ai_socktype, 0);
if (s2 < 0) {
(void) __close(s);
return (-1);
}
- listen(s2, 1);
- sin2len = sizeof (sin2);
- if (getsockname(s2, (struct sockaddr *)&sin2, &sin2len) < 0 ||
- sin2len != sizeof (sin2)) {
+ __listen(s2, 1);
+ sa2len = sizeof (sa2);
+ if (__getsockname(s2, &sa2.sa, &sa2len) < 0) {
perror("getsockname");
(void) __close(s2);
goto bad;
+ } else if (sa2len != SA_LEN(&sa2.sa)) {
+ __set_errno(EINVAL);
+ (void) __close(s2);
+ goto bad;
}
- port = ntohs((u_short)sin2.sin_port);
+ port = 0;
+ if (!getnameinfo(&sa2.sa, sa2len,
+ NULL, 0, servbuff, sizeof(servbuff),
+ NI_NUMERICSERV))
+ port = atoi(servbuff);
(void) sprintf(num, "%u", port);
(void) __write(s, num, strlen(num)+1);
- { int len = sizeof (from);
- s3 = accept(s2, (struct sockaddr *)&from, &len);
+ { socklen_t len = sizeof (from);
+ s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from,
+ &len));
__close(s2);
if (s3 < 0) {
perror("accept");
}
*fd2p = s3;
}
- (void) __write(s, name, strlen(name) + 1);
- /* should public key encypt the password here */
- (void) __write(s, pass, strlen(pass) + 1);
- (void) __write(s, cmd, strlen(cmd) + 1);
+
+ struct iovec iov[3] =
+ {
+ [0] = { .iov_base = (void *) name, .iov_len = strlen (name) + 1 },
+ /* should public key encypt the password here */
+ [1] = { .iov_base = (void *) pass, .iov_len = strlen (pass) + 1 },
+ [2] = { .iov_base = (void *) cmd, .iov_len = strlen (cmd) + 1 }
+ };
+ (void) TEMP_FAILURE_RETRY (__writev (s, iov, 3));
+
+ /* We don't need the memory allocated for the name and the password
+ in ruserpass anymore. */
+ if (name != orig_name)
+ free ((char *) name);
+ if (pass != orig_pass)
+ free ((char *) pass);
+
if (__read(s, &c, 1) != 1) {
perror(*ahost);
goto bad;
}
goto bad;
}
+ freeaddrinfo(res0);
return (s);
bad:
if (port)
(void) __close(*fd2p);
(void) __close(s);
+ freeaddrinfo(res0);
return (-1);
}
+libc_hidden_def (rexec_af)
+
+int
+rexec (char **ahost, int rport, const char *name, const char *pass,
+ const char *cmd, int *fd2p)
+{
+ return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
+}
projects / thirdparty / glibc.git / blobdiff