[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.175 and 1.176

version 1.175, 2008/01/01 09:27:33 version 1.176, 2008/02/08 23:24:08
Line 115 
Line 115 
         options->permit_tun = -1;          options->permit_tun = -1;
         options->num_permitted_opens = -1;          options->num_permitted_opens = -1;
         options->adm_forced_command = NULL;          options->adm_forced_command = NULL;
           options->chroot_directory = NULL;
 }  }
   
 void  void
Line 266 
Line 267 
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,          sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation,          sUsePrivilegeSeparation,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
Line 366 
Line 367 
         { "match", sMatch, SSHCFG_ALL },          { "match", sMatch, SSHCFG_ALL },
         { "permitopen", sPermitOpen, SSHCFG_ALL },          { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
           { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 1104 
Line 1106 
         case sBanner:          case sBanner:
                 charptr = &options->banner;                  charptr = &options->banner;
                 goto parse_filename;                  goto parse_filename;
   
         /*          /*
          * These options can contain %X options expanded at           * These options can contain %X options expanded at
          * connect time, so that you can specify paths like:           * connect time, so that you can specify paths like:
Line 1212 
Line 1215 
                         options->adm_forced_command = xstrdup(cp + len);                          options->adm_forced_command = xstrdup(cp + len);
                 return 0;                  return 0;
   
           case sChrootDirectory:
                   charptr = &options->chroot_directory;
                   goto parse_filename;
   
         case sDeprecated:          case sDeprecated:
                 logit("%s line %d: Deprecated option %s",                  logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);                      filename, linenum, arg);
Line 1320 
Line 1327 
         if (preauth)          if (preauth)
                 return;                  return;
         M_CP_STROPT(adm_forced_command);          M_CP_STROPT(adm_forced_command);
           M_CP_STROPT(chroot_directory);
 }  }
   
 #undef M_CP_INTOPT  #undef M_CP_INTOPT
Legend:
Removed from v.1.175  
changed lines
  Added in v.1.176