[BACK]Return to sshconnect.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.119 and 1.119.2.1

version 1.119, 2002/01/21 15:13:51 version 1.119.2.1, 2002/06/26 15:30:39
Line 36 
Line 36 
 char *client_version_string = NULL;  char *client_version_string = NULL;
 char *server_version_string = NULL;  char *server_version_string = NULL;
   
   /* import */
 extern Options options;  extern Options options;
 extern char *__progname;  extern char *__progname;
   extern uid_t original_real_uid;
   extern uid_t original_effective_uid;
   
 static const char *  static const char *
 sockaddr_ntop(struct sockaddr *sa)  sockaddr_ntop(struct sockaddr *sa, socklen_t salen)
 {  {
         void *addr;          static char addrbuf[NI_MAXHOST];
         static char addrbuf[INET6_ADDRSTRLEN];  
   
         switch (sa->sa_family) {          if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0,
         case AF_INET:              NI_NUMERICHOST) != 0)
                 addr = &((struct sockaddr_in *)sa)->sin_addr;                  fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed");
                 break;  
         case AF_INET6:  
                 addr = &((struct sockaddr_in6 *)sa)->sin6_addr;  
                 break;  
         default:  
                 /* This case should be protected against elsewhere */  
                 abort();        /* XXX abort is bad -- do something else */  
         }  
         inet_ntop(sa->sa_family, addr, addrbuf, sizeof(addrbuf));  
         return addrbuf;          return addrbuf;
 }  }
   
Line 64 
Line 57 
  * Connect to the given ssh server using a proxy command.   * Connect to the given ssh server using a proxy command.
  */   */
 static int  static int
 ssh_proxy_connect(const char *host, u_short port, struct passwd *pw,  ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
                   const char *proxy_command)  
 {  {
         Buffer command;          Buffer command;
         const char *cp;          const char *cp;
Line 115 
Line 107 
                 char *argv[10];                  char *argv[10];
   
                 /* Child.  Permanently give up superuser privileges. */                  /* Child.  Permanently give up superuser privileges. */
                 permanently_set_uid(pw);                  seteuid(original_real_uid);
                   setuid(original_real_uid);
   
                 /* Redirect stdin and stdout. */                  /* Redirect stdin and stdout. */
                 close(pin[1]);                  close(pin[1]);
Line 165 
Line 158 
  * Creates a (possibly privileged) socket for use as the ssh connection.   * Creates a (possibly privileged) socket for use as the ssh connection.
  */   */
 static int  static int
 ssh_create_socket(struct passwd *pw, int privileged, int family)  ssh_create_socket(int privileged, int family)
 {  {
         int sock, gaierr;          int sock, gaierr;
         struct addrinfo hints, *res;          struct addrinfo hints, *res;
Line 176 
Line 169 
          */           */
         if (privileged) {          if (privileged) {
                 int p = IPPORT_RESERVED - 1;                  int p = IPPORT_RESERVED - 1;
                   PRIV_START;
                 sock = rresvport_af(&p, family);                  sock = rresvport_af(&p, family);
                   PRIV_END;
                 if (sock < 0)                  if (sock < 0)
                         error("rresvport: af=%d %.100s", family, strerror(errno));                          error("rresvport: af=%d %.100s", family, strerror(errno));
                 else                  else
                         debug("Allocated local port %d.", p);                          debug("Allocated local port %d.", p);
                 return sock;                  return sock;
         }          }
         /*  
          * Just create an ordinary socket on arbitrary port.  We use  
          * the user's uid to create the socket.  
          */  
         temporarily_use_uid(pw);  
         sock = socket(family, SOCK_STREAM, 0);          sock = socket(family, SOCK_STREAM, 0);
         if (sock < 0)          if (sock < 0)
                 error("socket: %.100s", strerror(errno));                  error("socket: %.100s", strerror(errno));
         restore_uid();  
   
         /* Bind the socket to an alternative local IP address */          /* Bind the socket to an alternative local IP address */
         if (options.bind_address == NULL)          if (options.bind_address == NULL)
Line 221 
Line 210 
 /*  /*
  * Opens a TCP/IP connection to the remote server on the given host.   * Opens a TCP/IP connection to the remote server on the given host.
  * The address of the remote host will be returned in hostaddr.   * The address of the remote host will be returned in hostaddr.
  * If port is 0, the default port will be used.  If anonymous is zero,   * If port is 0, the default port will be used.  If needpriv is true,
  * a privileged port will be allocated to make the connection.   * a privileged port will be allocated to make the connection.
  * This requires super-user privileges if anonymous is false.   * This requires super-user privileges if needpriv is true.
  * Connection_attempts specifies the maximum number of tries (one per   * Connection_attempts specifies the maximum number of tries (one per
  * second).  If proxy_command is non-NULL, it specifies the command (with %h   * second).  If proxy_command is non-NULL, it specifies the command (with %h
  * and %p substituted for host and port, respectively) to use to contact   * and %p substituted for host and port, respectively) to use to contact
Line 238 
Line 227 
 int  int
 ssh_connect(const char *host, struct sockaddr_storage * hostaddr,  ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
     u_short port, int family, int connection_attempts,      u_short port, int family, int connection_attempts,
     int anonymous, struct passwd *pw, const char *proxy_command)      int needpriv, const char *proxy_command)
 {  {
         int gaierr;          int gaierr;
         int on = 1;          int on = 1;
Line 254 
Line 243 
          */           */
         int full_failure = 1;          int full_failure = 1;
   
         debug("ssh_connect: getuid %u geteuid %u anon %d",          debug("ssh_connect: needpriv %d", needpriv);
             (u_int) getuid(), (u_int) geteuid(), anonymous);  
   
         /* Get default port if port has not been set. */          /* Get default port if port has not been set. */
         if (port == 0) {          if (port == 0) {
Line 267 
Line 255 
         }          }
         /* If a proxy command is given, connect using it. */          /* If a proxy command is given, connect using it. */
         if (proxy_command != NULL)          if (proxy_command != NULL)
                 return ssh_proxy_connect(host, port, pw, proxy_command);                  return ssh_proxy_connect(host, port, proxy_command);
   
         /* No proxy command. */          /* No proxy command. */
   
         memset(&hints, 0, sizeof(hints));          memset(&hints, 0, sizeof(hints));
         hints.ai_family = family;          hints.ai_family = family;
         hints.ai_socktype = SOCK_STREAM;          hints.ai_socktype = SOCK_STREAM;
         snprintf(strport, sizeof strport, "%d", port);          snprintf(strport, sizeof strport, "%u", port);
         if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)          if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
                 fatal("%s: %.100s: %s", __progname, host,                  fatal("%s: %.100s: %s", __progname, host,
                     gai_strerror(gaierr));                      gai_strerror(gaierr));
Line 303 
Line 291 
                                 host, ntop, strport);                                  host, ntop, strport);
   
                         /* Create a socket for connecting. */                          /* Create a socket for connecting. */
                         sock = ssh_create_socket(pw,                          sock = ssh_create_socket(needpriv, ai->ai_family);
                             !anonymous && geteuid() == 0,  
                             ai->ai_family);  
                         if (sock < 0)                          if (sock < 0)
                                 /* Any error is already output */                                  /* Any error is already output */
                                 continue;                                  continue;
   
                         /* Connect to the host.  We use the user's uid in the  
                          * hope that it will help with tcp_wrappers showing  
                          * the remote uid as root.  
                          */  
                         temporarily_use_uid(pw);  
                         if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {                          if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {
                                 /* Successful connection. */                                  /* Successful connection. */
                                 memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);                                  memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
                                 restore_uid();  
                                 break;                                  break;
                         } else {                          } else {
                                 if (errno == ECONNREFUSED)                                  if (errno == ECONNREFUSED)
                                         full_failure = 0;                                          full_failure = 0;
                                 log("ssh: connect to address %s port %s: %s",                                  log("ssh: connect to address %s port %s: %s",
                                     sockaddr_ntop(ai->ai_addr), strport,                                      sockaddr_ntop(ai->ai_addr, ai->ai_addrlen),
                                     strerror(errno));                                      strport, strerror(errno));
                                 restore_uid();  
                                 /*                                  /*
                                  * Close the failed socket; there appear to                                   * Close the failed socket; there appear to
                                  * be some problems when reusing a socket for                                   * be some problems when reusing a socket for
Line 506 
Line 485 
  * check whether the supplied host key is valid, return -1 if the key   * check whether the supplied host key is valid, return -1 if the key
  * is not valid. the user_hostfile will not be updated if 'readonly' is true.   * is not valid. the user_hostfile will not be updated if 'readonly' is true.
  */   */
   
 static int  static int
 check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,  check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
     int readonly, const char *user_hostfile, const char *system_hostfile)      int readonly, const char *user_hostfile, const char *system_hostfile)
Line 784 
Line 762 
                         len = strlen(msg);                          len = strlen(msg);
                         snprintf(msg + len, sizeof(msg) - len,                          snprintf(msg + len, sizeof(msg) - len,
                             "\nMatching host key in %s:%d",                              "\nMatching host key in %s:%d",
                              host_file, host_line);                              host_file, host_line);
                 }                  }
                 if (options.strict_host_key_checking == 1) {                  if (options.strict_host_key_checking == 1) {
                         log(msg);                          log(msg);
Line 832 
Line 810 
  * This function does not require super-user privileges.   * This function does not require super-user privileges.
  */   */
 void  void
 ssh_login(Key **keys, int nkeys, const char *orighost,  ssh_login(Sensitive *sensitive, const char *orighost,
     struct sockaddr *hostaddr, struct passwd *pw)      struct sockaddr *hostaddr, struct passwd *pw)
 {  {
         char *host, *cp;          char *host, *cp;
Line 857 
Line 835 
         /* authenticate user */          /* authenticate user */
         if (compat20) {          if (compat20) {
                 ssh_kex2(host, hostaddr);                  ssh_kex2(host, hostaddr);
                 ssh_userauth2(local_user, server_user, host, keys, nkeys);                  ssh_userauth2(local_user, server_user, host, sensitive);
         } else {          } else {
                 ssh_kex(host, hostaddr);                  ssh_kex(host, hostaddr);
                 ssh_userauth1(local_user, server_user, host, keys, nkeys);                  ssh_userauth1(local_user, server_user, host, sensitive);
         }          }
 }  }
   
Legend:
Removed from v.1.119  
changed lines
  Added in v.1.119.2.1