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

Diff for /src/usr.bin/ssh/auth-rhosts.c between version 1.16.2.3 and 1.16.2.4

version 1.16.2.3, 2001/03/21 19:46:22 version 1.16.2.4, 2001/05/07 21:09:25
Line 25 
Line 25 
 #include "canohost.h"  #include "canohost.h"
 #include "auth.h"  #include "auth.h"
   
   /* import */
   extern ServerOptions options;
   
 /*  /*
  * This function processes an rhosts-style file (.rhosts, .shosts, or   * This function processes an rhosts-style file (.rhosts, .shosts, or
  * /etc/hosts.equiv).  This returns true if authentication can be granted   * /etc/hosts.equiv).  This returns true if authentication can be granted
Line 150 
Line 153 
 int  int
 auth_rhosts(struct passwd *pw, const char *client_user)  auth_rhosts(struct passwd *pw, const char *client_user)
 {  {
         extern ServerOptions options;  
         char buf[1024];  
         const char *hostname, *ipaddr;          const char *hostname, *ipaddr;
           int ret;
   
           hostname = get_canonical_hostname(options.reverse_mapping_check);
           ipaddr = get_remote_ipaddr();
           ret = auth_rhosts2(pw, client_user, hostname, ipaddr);
           return ret;
   }
   
   int
   auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
       const char *ipaddr)
   {
           char buf[1024];
         struct stat st;          struct stat st;
         static const char *rhosts_files[] = {".shosts", ".rhosts", NULL};          static const char *rhosts_files[] = {".shosts", ".rhosts", NULL};
         u_int rhosts_file_index;          u_int rhosts_file_index;
   
           debug2("auth_rhosts2: clientuser %s hostname %s ipaddr %s",
               client_user, hostname, ipaddr);
   
         /* no user given */          /* no user given */
         if (pw == NULL)          if (pw == NULL)
                 return 0;                  return 0;
   
         /* Switch to the user's uid. */          /* Switch to the user's uid. */
         temporarily_use_uid(pw->pw_uid);          temporarily_use_uid(pw);
         /*          /*
          * Quick check: if the user has no .shosts or .rhosts files, return           * Quick check: if the user has no .shosts or .rhosts files, return
          * failure immediately without doing costly lookups from name           * failure immediately without doing costly lookups from name
Line 184 
Line 202 
             stat(_PATH_SSH_HOSTS_EQUIV, &st) < 0)              stat(_PATH_SSH_HOSTS_EQUIV, &st) < 0)
                 return 0;                  return 0;
   
         hostname = get_canonical_hostname(options.reverse_mapping_check);  
         ipaddr = get_remote_ipaddr();  
   
         /* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */          /* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */
         if (pw->pw_uid != 0) {          if (pw->pw_uid != 0) {
                 if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user,                  if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user,
Line 223 
Line 238 
                 return 0;                  return 0;
         }          }
         /* Temporarily use the user's uid. */          /* Temporarily use the user's uid. */
         temporarily_use_uid(pw->pw_uid);          temporarily_use_uid(pw);
   
         /* Check all .rhosts files (currently .shosts and .rhosts). */          /* Check all .rhosts files (currently .shosts and .rhosts). */
         for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];          for (rhosts_file_index = 0; rhosts_files[rhosts_file_index];
Legend:
Removed from v.1.16.2.3  
changed lines
  Added in v.1.16.2.4