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

Diff for /src/usr.bin/ssh/ssh.c between version 1.324 and 1.325

version 1.324, 2009/02/12 03:00:56 version 1.325, 2009/03/17 21:37:00
Line 196 
Line 196 
 main(int ac, char **av)  main(int ac, char **av)
 {  {
         int i, opt, exit_status, use_syslog;          int i, opt, exit_status, use_syslog;
         char *p, *cp, *line, buf[256];          char *p, *cp, *line, *argv0, buf[256];
         struct stat st;          struct stat st;
         struct passwd *pw;          struct passwd *pw;
         int dummy, timeout_ms;          int dummy, timeout_ms;
Line 257 
Line 257 
         /* Parse command-line arguments. */          /* Parse command-line arguments. */
         host = NULL;          host = NULL;
         use_syslog = 0;          use_syslog = 0;
           argv0 = av[0];
   
  again:   again:
         while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"          while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
Line 587 
Line 588 
          * Initialize "log" output.  Since we are the client all output           * Initialize "log" output.  Since we are the client all output
          * actually goes to stderr.           * actually goes to stderr.
          */           */
         log_init(av[0],          log_init(argv0,
             options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,              options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
             SYSLOG_FACILITY_USER, !use_syslog);              SYSLOG_FACILITY_USER, !use_syslog);
   
Line 615 
Line 616 
         channel_set_af(options.address_family);          channel_set_af(options.address_family);
   
         /* reinit */          /* reinit */
         log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, !use_syslog);          log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
   
         if (options.user == NULL)          if (options.user == NULL)
                 options.user = xstrdup(pw->pw_name);                  options.user = xstrdup(pw->pw_name);
Legend:
Removed from v.1.324  
changed lines
  Added in v.1.325