[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.282 and 1.283

version 1.282, 2015/10/29 08:05:01 version 1.283, 2015/11/13 04:38:06
Line 356 
Line 356 
         CLEAR_ON_NONE(options->trusted_user_ca_keys);          CLEAR_ON_NONE(options->trusted_user_ca_keys);
         CLEAR_ON_NONE(options->revoked_keys_file);          CLEAR_ON_NONE(options->revoked_keys_file);
         CLEAR_ON_NONE(options->authorized_principals_file);          CLEAR_ON_NONE(options->authorized_principals_file);
           CLEAR_ON_NONE(options->adm_forced_command);
           CLEAR_ON_NONE(options->chroot_directory);
         for (i = 0; i < options->num_host_key_files; i++)          for (i = 0; i < options->num_host_key_files; i++)
                 CLEAR_ON_NONE(options->host_key_files[i]);                  CLEAR_ON_NONE(options->host_key_files[i]);
         for (i = 0; i < options->num_host_cert_files; i++)          for (i = 0; i < options->num_host_cert_files; i++)
Line 1982 
Line 1984 
         if (preauth)          if (preauth)
                 return;                  return;
   
           /* These options may be "none" to clear a global setting */
         M_CP_STROPT(adm_forced_command);          M_CP_STROPT(adm_forced_command);
           if (option_clear_or_none(dst->adm_forced_command)) {
                   free(dst->adm_forced_command);
                   dst->adm_forced_command = NULL;
           }
         M_CP_STROPT(chroot_directory);          M_CP_STROPT(chroot_directory);
           if (option_clear_or_none(dst->chroot_directory)) {
                   free(dst->chroot_directory);
                   dst->chroot_directory = NULL;
           }
 }  }
   
 #undef M_CP_INTOPT  #undef M_CP_INTOPT
Legend:
Removed from v.1.282  
changed lines
  Added in v.1.283