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

Diff for /src/usr.bin/ssh/channels.c between version 1.11 and 1.12

version 1.11, 1999/10/04 20:45:01 version 1.12, 1999/10/05 22:18:52
Line 43 
Line 43 
 #define SSH_CHANNEL_INPUT_DRAINING      10 /* sending remaining data to conn */  #define SSH_CHANNEL_INPUT_DRAINING      10 /* sending remaining data to conn */
 #define SSH_CHANNEL_OUTPUT_DRAINING     11 /* sending remaining data to app */  #define SSH_CHANNEL_OUTPUT_DRAINING     11 /* sending remaining data to app */
   
   /* Max len of agent socket */
   #define MAX_SOCKET_NAME 100
   
 /* Data structure for channel data.  This is iniailized in channel_allocate  /* Data structure for channel data.  This is iniailized in channel_allocate
    and cleared in channel_free. */     and cleared in channel_free. */
   
Line 72 
Line 75 
    in channel_allocate. */     in channel_allocate. */
 static int channel_max_fd_value = 0;  static int channel_max_fd_value = 0;
   
 /* These two variables are for authentication agent forwarding. */  /* Name and directory of socket for authentication agent forwarding. */
 static int channel_forwarded_auth_fd = -1;  
 static char *channel_forwarded_auth_socket_name = NULL;  static char *channel_forwarded_auth_socket_name = NULL;
   static char *channel_forwarded_auth_socket_dir  = NULL;
   
 /* Saved X11 authentication protocol name. */  /* Saved X11 authentication protocol name. */
 char *x11_saved_proto = NULL;  char *x11_saved_proto = NULL;
Line 906 
Line 909 
   /* Port numbers are 16 bit quantities. */    /* Port numbers are 16 bit quantities. */
   if ((port & 0xffff) != port)    if ((port & 0xffff) != port)
     packet_disconnect("Requested forwarding of nonexistent port %d.", port);      packet_disconnect("Requested forwarding of nonexistent port %d.", port);
   
   
   /* Check that an unprivileged user is not trying to forward a privileged    /* Check that an unprivileged user is not trying to forward a privileged
      port. */       port. */
Line 1357 
Line 1359 
   packet_write_wait();    packet_write_wait();
 }  }
   
 /* Returns the number of the file descriptor to pass to child programs as  
    the authentication fd.  Returns -1 if there is no forwarded authentication  
    fd. */  
   
 int auth_get_fd()  
 {  
   return channel_forwarded_auth_fd;  
 }  
   
 /* Returns the name of the forwarded authentication socket.  Returns NULL  /* Returns the name of the forwarded authentication socket.  Returns NULL
    if there is no forwarded authentication socket.  The returned value     if there is no forwarded authentication socket.  The returned value
    points to a static buffer. */     points to a static buffer. */
Line 1375 
Line 1368 
   return channel_forwarded_auth_socket_name;    return channel_forwarded_auth_socket_name;
 }  }
   
   /* removes the agent forwarding socket */
   
   void cleanup_socket(void) {
     remove(channel_forwarded_auth_socket_name);
     rmdir(channel_forwarded_auth_socket_dir);
   }
   
 /* This if called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.  /* This if called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.
    This starts forwarding authentication requests. */     This starts forwarding authentication requests. */
   
 void auth_input_request_forwarding(struct passwd *pw)  void auth_input_request_forwarding(struct passwd *pw)
 {  {
   mode_t savedumask;  
   int sock, newch;    int sock, newch;
   struct sockaddr_un sunaddr;    struct sockaddr_un sunaddr;
   
   if (auth_get_socket_name() != NULL)    if (auth_get_socket_name() != NULL)
     fatal("Protocol error: authentication forwarding requested twice.");      fatal("Protocol error: authentication forwarding requested twice.");
   
     /* Temporarily drop privileged uid for mkdir/bind. */
     temporarily_use_uid(pw->pw_uid);
   
   /* Allocate a buffer for the socket name, and format the name. */    /* Allocate a buffer for the socket name, and format the name. */
   channel_forwarded_auth_socket_name = xmalloc(100);    channel_forwarded_auth_socket_name = xmalloc(MAX_SOCKET_NAME);
   sprintf(channel_forwarded_auth_socket_name, SSH_AGENT_SOCKET,    channel_forwarded_auth_socket_dir  = xmalloc(MAX_SOCKET_NAME);
           (int)getpid());    strlcpy(channel_forwarded_auth_socket_dir, "/tmp/ssh-XXXXXXXX", MAX_SOCKET_NAME);
   
     /* Create private directory for socket */
     if (mkdtemp(channel_forwarded_auth_socket_dir) == NULL)
       packet_disconnect("mkdtemp: %.100s", strerror(errno));
     snprintf(channel_forwarded_auth_socket_name, MAX_SOCKET_NAME,
              "%s/agent.%d", channel_forwarded_auth_socket_dir, (int)getpid());
   
     if (atexit(cleanup_socket) < 0) {
       int saved=errno;
       cleanup_socket();
       packet_disconnect("socket: %.100s", strerror(saved));
     }
   
   /* Create the socket. */    /* Create the socket. */
   sock = socket(AF_UNIX, SOCK_STREAM, 0);    sock = socket(AF_UNIX, SOCK_STREAM, 0);
   if (sock < 0)    if (sock < 0)
Line 1403 
Line 1417 
   strncpy(sunaddr.sun_path, channel_forwarded_auth_socket_name,    strncpy(sunaddr.sun_path, channel_forwarded_auth_socket_name,
           sizeof(sunaddr.sun_path));            sizeof(sunaddr.sun_path));
   
   savedumask = umask(0077);  
   
   /* Temporarily use a privileged uid. */  
   temporarily_use_uid(pw->pw_uid);  
   
   if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0)    if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0)
     packet_disconnect("bind: %.100s", strerror(errno));      packet_disconnect("bind: %.100s", strerror(errno));
   
   /* Restore the privileged uid. */    /* Restore the privileged uid. */
   restore_uid();    restore_uid();
   
   umask(savedumask);  
   
   /* Start listening on the socket. */    /* Start listening on the socket. */
   if (listen(sock, 5) < 0)    if (listen(sock, 5) < 0)
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12