Deleted Added
full compact
servconf.c (98941) servconf.c (99047)
1/*
2 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
3 * All rights reserved
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be

--- 285 unchanged lines hidden (view full) ---

294 sUseLogin, sAllowTcpForwarding, sCompression,
295 sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
296 sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
297 sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
298 sBanner, sVerifyReverseMapping, sHostbasedAuthentication,
299 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
300 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
301 sUsePrivilegeSeparation,
1/*
2 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
3 * All rights reserved
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be

--- 285 unchanged lines hidden (view full) ---

294 sUseLogin, sAllowTcpForwarding, sCompression,
295 sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
296 sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
297 sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
298 sBanner, sVerifyReverseMapping, sHostbasedAuthentication,
299 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
300 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
301 sUsePrivilegeSeparation,
302 sVersionAddendum,
302 sDeprecated
303} ServerOpCodes;
304
305/* Textual representation of the tokens. */
306static struct {
307 const char *name;
308 ServerOpCodes opcode;
309} keywords[] = {

--- 61 unchanged lines hidden (view full) ---

371 { "banner", sBanner },
372 { "verifyreversemapping", sVerifyReverseMapping },
373 { "reversemappingcheck", sVerifyReverseMapping },
374 { "clientaliveinterval", sClientAliveInterval },
375 { "clientalivecountmax", sClientAliveCountMax },
376 { "authorizedkeysfile", sAuthorizedKeysFile },
377 { "authorizedkeysfile2", sAuthorizedKeysFile2 },
378 { "useprivilegeseparation", sUsePrivilegeSeparation},
303 sDeprecated
304} ServerOpCodes;
305
306/* Textual representation of the tokens. */
307static struct {
308 const char *name;
309 ServerOpCodes opcode;
310} keywords[] = {

--- 61 unchanged lines hidden (view full) ---

372 { "banner", sBanner },
373 { "verifyreversemapping", sVerifyReverseMapping },
374 { "reversemappingcheck", sVerifyReverseMapping },
375 { "clientaliveinterval", sClientAliveInterval },
376 { "clientalivecountmax", sClientAliveCountMax },
377 { "authorizedkeysfile", sAuthorizedKeysFile },
378 { "authorizedkeysfile2", sAuthorizedKeysFile2 },
379 { "useprivilegeseparation", sUsePrivilegeSeparation},
380 { "versionaddendum", sVersionAddendum },
379 { NULL, sBadOption }
380};
381
382/*
383 * Returns the number of the token pointed to by cp or sBadOption.
384 */
385
386static ServerOpCodes

--- 507 unchanged lines hidden (view full) ---

894 case sClientAliveInterval:
895 intptr = &options->client_alive_interval;
896 goto parse_time;
897
898 case sClientAliveCountMax:
899 intptr = &options->client_alive_count_max;
900 goto parse_int;
901
381 { NULL, sBadOption }
382};
383
384/*
385 * Returns the number of the token pointed to by cp or sBadOption.
386 */
387
388static ServerOpCodes

--- 507 unchanged lines hidden (view full) ---

896 case sClientAliveInterval:
897 intptr = &options->client_alive_interval;
898 goto parse_time;
899
900 case sClientAliveCountMax:
901 intptr = &options->client_alive_count_max;
902 goto parse_int;
903
904 case sVersionAddendum:
905 ssh_version_set_addendum(strtok(cp, "\n"));
906 do {
907 arg = strdelim(&cp);
908 } while (arg != NULL && *arg != '\0');
909 break;
910
902 case sDeprecated:
903 log("%s line %d: Deprecated option %s",
904 filename, linenum, arg);
905 while (arg)
906 arg = strdelim(&cp);
907 break;
908
909 default:

--- 36 unchanged lines hidden ---
911 case sDeprecated:
912 log("%s line %d: Deprecated option %s",
913 filename, linenum, arg);
914 while (arg)
915 arg = strdelim(&cp);
916 break;
917
918 default:

--- 36 unchanged lines hidden ---