[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.26 and 1.27

version 1.26, 1999/10/28 21:29:26 version 1.27, 1999/11/10 23:36:44
Line 32 
Line 32 
    command line. */     command line. */
 int debug_flag = 0;  int debug_flag = 0;
   
 /* Flag indicating whether quiet mode is on. */  
 int quiet_flag = 0;  
   
 /* Flag indicating whether to allocate a pseudo tty.  This can be set on the  /* Flag indicating whether to allocate a pseudo tty.  This can be set on the
    command line, and is automatically set if no command is given on the command     command line, and is automatically set if no command is given on the command
    line. */     line. */
Line 306 
Line 303 
   
         case 'v':          case 'v':
         case 'V':          case 'V':
           debug_flag = 1;  
           fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n",            fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n",
                   SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR);                    SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR);
           fprintf(stderr, "Compiled with SSL.\n");            fprintf(stderr, "Compiled with SSL.\n");
           if (opt == 'V')            if (opt == 'V')
             exit(0);              exit(0);
             debug_flag = 1;
             options.log_level = SYSLOG_LEVEL_DEBUG;
           break;            break;
   
         case 'q':          case 'q':
           quiet_flag = 1;            options.log_level = SYSLOG_LEVEL_QUIET;
           break;            break;
   
         case 'e':          case 'e':
Line 466 
Line 464 
   
   /* Initialize "log" output.  Since we are the client all output actually    /* Initialize "log" output.  Since we are the client all output actually
      goes to the terminal. */       goes to the terminal. */
   log_init(av[0], 1, debug_flag, quiet_flag, SYSLOG_FACILITY_USER);    log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0);
   
   /* Read per-user configuration file. */    /* Read per-user configuration file. */
   snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_CONFFILE);    snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_CONFFILE);
Line 477 
Line 475 
   
   /* Fill configuration defaults. */    /* Fill configuration defaults. */
   fill_default_options(&options);    fill_default_options(&options);
   
     /* reinit */
     log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0);
   
   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.26  
changed lines
  Added in v.1.27