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

Diff for /src/usr.bin/ssh/servconf.c between version 1.211 and 1.212

version 1.211, 2010/09/22 05:01:29 version 1.212, 2010/09/30 11:04:51
Line 247 
Line 247 
         if (options->authorized_keys_file2 == NULL) {          if (options->authorized_keys_file2 == NULL) {
                 /* authorized_keys_file2 falls back to authorized_keys_file */                  /* authorized_keys_file2 falls back to authorized_keys_file */
                 if (options->authorized_keys_file != NULL)                  if (options->authorized_keys_file != NULL)
                         options->authorized_keys_file2 = options->authorized_keys_file;                          options->authorized_keys_file2 = xstrdup(options->authorized_keys_file);
                 else                  else
                         options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2;                          options->authorized_keys_file2 = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS2);
         }          }
         if (options->authorized_keys_file == NULL)          if (options->authorized_keys_file == NULL)
                 options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;                  options->authorized_keys_file = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS);
         if (options->permit_tun == -1)          if (options->permit_tun == -1)
                 options->permit_tun = SSH_TUNMODE_NO;                  options->permit_tun = SSH_TUNMODE_NO;
         if (options->zero_knowledge_password_authentication == -1)          if (options->zero_knowledge_password_authentication == -1)
Legend:
Removed from v.1.211  
changed lines
  Added in v.1.212