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

Return to servconf.c CVS log

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

Diff for /src/usr.bin/ssh/servconf.c between version 1.120 and 1.121

version 1.120, 2003/05/15 04:08:44

version 1.121, 2003/05/15 14:02:47

Line 180

if (options->kerberos_or_local_passwd == -1)

options->kerberos_or_local_passwd = 1;

if (options->kerberos_ticket_cleanup == -1)

#if defined(KRB4) || defined(KRB5)

options->kerberos_ticket_cleanup = 1;

#else

options->kerberos_ticket_cleanup = 0;

#endif

if (options->kerberos_tgt_passing == -1)

options->kerberos_tgt_passing = 0;

if (options->afs_token_passing == -1)

Line 254

Line 250

sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,

sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,

sUsePrivilegeSeparation,

sDeprecated

sDeprecated, sUnsupported

} ServerOpCodes;

/* Textual representation of the tokens. */

Line 279

Line 275

{ "rsaauthentication", sRSAAuthentication },

{ "pubkeyauthentication", sPubkeyAuthentication },

{ "dsaauthentication", sPubkeyAuthentication }, /* alias */

#if defined(KRB4) || defined(KRB5)

{ "kerberosauthentication", sKerberosAuthentication },

{ "kerberosorlocalpasswd", sKerberosOrLocalPasswd },

{ "kerberosticketcleanup", sKerberosTicketCleanup },

{ "kerberostgtpassing", sKerberosTgtPassing },

#else

{ "kerberosauthentication", sUnsupported },

{ "kerberosorlocalpasswd", sUnsupported },

{ "kerberosticketcleanup", sUnsupported },

{ "kerberostgtpassing", sUnsupported },

#endif

#if defined(AFS)

{ "afstokenpassing", sAFSTokenPassing },

#else

{ "afstokenpassing", sUnsupported },

#endif

{ "passwordauthentication", sPasswordAuthentication },

{ "kbdinteractiveauthentication", sKbdInteractiveAuthentication },

{ "challengeresponseauthentication", sChallengeResponseAuthentication },

Line 845

Line 852

case sDeprecated:

logit("%s line %d: Deprecated option %s",

filename, linenum, arg);

while (arg)

arg = strdelim(&cp);

break;

case sUnsupported:

logit("%s line %d: Unsupported option %s",

filename, linenum, arg);

while (arg)

arg = strdelim(&cp);