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

Diff for /src/usr.bin/ssh/sftp-server.c between version 1.76 and 1.77

version 1.76, 2008/02/04 21:53:00 version 1.77, 2008/02/08 23:24:07
Line 1198 
Line 1198 
 }  }
   
 int  int
 sftp_server_main(int argc, char **argv)  sftp_server_main(int argc, char **argv, struct passwd *user_pw)
 {  {
         fd_set *rset, *wset;          fd_set *rset, *wset;
         int in, out, max, ch, skipargs = 0, log_stderr = 0;          int in, out, max, ch, skipargs = 0, log_stderr = 0;
Line 1209 
Line 1209 
         extern char *optarg;          extern char *optarg;
         extern char *__progname;          extern char *__progname;
   
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */  
         sanitise_stdfd();  
   
         log_init(__progname, log_level, log_facility, log_stderr);          log_init(__progname, log_level, log_facility, log_stderr);
   
         while (!skipargs && (ch = getopt(argc, argv, "C:f:l:che")) != -1) {          while (!skipargs && (ch = getopt(argc, argv, "C:f:l:che")) != -1) {
Line 1255 
Line 1252 
         } else          } else
                 client_addr = xstrdup("UNKNOWN");                  client_addr = xstrdup("UNKNOWN");
   
         if ((pw = getpwuid(getuid())) == NULL) {          pw = pwcopy(user_pw);
                 error("No user found for uid %lu", (u_long)getuid());  
                 sftp_server_cleanup_exit(255);  
         }  
         pw = pwcopy(pw);  
   
         logit("session opened for local user %s from [%s]",          logit("session opened for local user %s from [%s]",
             pw->pw_name, client_addr);              pw->pw_name, client_addr);
Legend:
Removed from v.1.76  
changed lines
  Added in v.1.77