src/usr.bin/ssh/readconf.c - diff

Return to readconf.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readconf.c between version 1.182 and 1.183

version 1.182, 2010/01/09 23:04:13

version 1.183, 2010/02/08 10:50:20

Line 120

oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,

oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,

oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,

oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,

oHostKeyAlgorithms, oBindAddress, oPKCS11Provider,

oClearAllForwardings, oNoHostAuthenticationForLocalhost,

oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,

oAddressFamily, oGssAuthentication, oGssDelegateCreds,

Line 202

{ "preferredauthentications", oPreferredAuthentications },

{ "hostkeyalgorithms", oHostKeyAlgorithms },

{ "bindaddress", oBindAddress },

#ifdef SMARTCARD

#ifdef ENABLE_PKCS11

{ "smartcarddevice", oSmartcardDevice },

{ "smartcarddevice", oPKCS11Provider },

{ "pkcs11provider", oPKCS11Provider },

#else

{ "smartcarddevice", oUnsupported },

{ "pkcs11provider", oUnsupported },

#endif

{ "clearallforwardings", oClearAllForwardings },

{ "enablesshkeysign", oEnableSSHKeysign },

Line 604

Line 606

charptr = &options->bind_address;

goto parse_string;

case oSmartcardDevice:

case oPKCS11Provider:

charptr = &options->smartcard_device;

charptr = &options->pkcs11_provider;

goto parse_string;

case oProxyCommand:

Line 1046

Line 1048

options->log_level = SYSLOG_LEVEL_NOT_SET;

options->preferred_authentications = NULL;

options->bind_address = NULL;

options->smartcard_device = NULL;

options->pkcs11_provider = NULL;

options->enable_ssh_keysign = - 1;

options->no_host_authentication_for_localhost = - 1;

options->identities_only = - 1;