[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.144 and 1.145

version 1.144, 2005/08/06 10:03:12 version 1.145, 2005/12/06 22:38:27
Line 96 
Line 96 
         options->authorized_keys_file = NULL;          options->authorized_keys_file = NULL;
         options->authorized_keys_file2 = NULL;          options->authorized_keys_file2 = NULL;
         options->num_accept_env = 0;          options->num_accept_env = 0;
           options->permit_tun = -1;
   
         /* Needs to be accessable in many places */          /* Needs to be accessable in many places */
         use_privsep = -1;          use_privsep = -1;
Line 219 
Line 220 
         }          }
         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 = _PATH_SSH_USER_PERMITTED_KEYS;
           if (options->permit_tun == -1)
                   options->permit_tun = 0;
   
         /* Turn privilege separation on by default */          /* Turn privilege separation on by default */
         if (use_privsep == -1)          if (use_privsep == -1)
Line 247 
Line 250 
         sBanner, sUseDNS, sHostbasedAuthentication,          sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,          sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sUsePrivilegeSeparation,          sUsePrivilegeSeparation,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
Line 338 
Line 341 
         { "authorizedkeysfile2", sAuthorizedKeysFile2 },          { "authorizedkeysfile2", sAuthorizedKeysFile2 },
         { "useprivilegeseparation", sUsePrivilegeSeparation},          { "useprivilegeseparation", sUsePrivilegeSeparation},
         { "acceptenv", sAcceptEnv },          { "acceptenv", sAcceptEnv },
           { "permittunnel", sPermitTunnel },
         { NULL, sBadOption }          { NULL, sBadOption }
 };  };
   
Line 920 
Line 924 
                             xstrdup(arg);                              xstrdup(arg);
                 }                  }
                 break;                  break;
   
           case sPermitTunnel:
                   intptr = &options->permit_tun;
                   goto parse_flag;
   
         case sDeprecated:          case sDeprecated:
                 logit("%s line %d: Deprecated option %s",                  logit("%s line %d: Deprecated option %s",
Legend:
Removed from v.1.144  
changed lines
  Added in v.1.145