[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.270 and 1.271

version 1.270, 2015/05/21 06:43:30 version 1.271, 2015/05/22 03:50:02
Line 107 
Line 107 
         options->kerberos_get_afs_token = -1;          options->kerberos_get_afs_token = -1;
         options->gss_authentication=-1;          options->gss_authentication=-1;
         options->gss_cleanup_creds = -1;          options->gss_cleanup_creds = -1;
           options->gss_strict_acceptor = -1;
         options->password_authentication = -1;          options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;          options->kbd_interactive_authentication = -1;
         options->challenge_response_authentication = -1;          options->challenge_response_authentication = -1;
Line 260 
Line 261 
                 options->gss_authentication = 0;                  options->gss_authentication = 0;
         if (options->gss_cleanup_creds == -1)          if (options->gss_cleanup_creds == -1)
                 options->gss_cleanup_creds = 1;                  options->gss_cleanup_creds = 1;
           if (options->gss_strict_acceptor == -1)
                   options->gss_strict_acceptor = 0;
         if (options->password_authentication == -1)          if (options->password_authentication == -1)
                 options->password_authentication = 1;                  options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)          if (options->kbd_interactive_authentication == -1)
Line 368 
Line 371 
         sBanner, sUseDNS, sHostbasedAuthentication,          sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,          sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,
         sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,          sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
           sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sHostCertificate,          sHostCertificate,
Line 428 
Line 432 
 #ifdef GSSAPI  #ifdef GSSAPI
         { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },          { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
         { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },          { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
           { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
 #else  #else
         { "gssapiauthentication", sUnsupported, SSHCFG_ALL },          { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
         { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },          { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
           { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
 #endif  #endif
         { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },          { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },          { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
Line 1163 
Line 1169 
   
         case sGssCleanupCreds:          case sGssCleanupCreds:
                 intptr = &options->gss_cleanup_creds;                  intptr = &options->gss_cleanup_creds;
                   goto parse_flag;
   
           case sGssStrictAcceptor:
                   intptr = &options->gss_strict_acceptor;
                 goto parse_flag;                  goto parse_flag;
   
         case sPasswordAuthentication:          case sPasswordAuthentication:
Legend:
Removed from v.1.270  
changed lines
  Added in v.1.271