[BACK]Return to servconf.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.h between version 1.71.4.2 and 1.72

version 1.71.4.2, 2006/10/06 03:19:33 version 1.72, 2005/12/06 22:38:27
Line 1 
Line 1 
 /* $OpenBSD$ */  /*      $OpenBSD$       */
   
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
Line 16 
Line 16 
 #ifndef SERVCONF_H  #ifndef SERVCONF_H
 #define SERVCONF_H  #define SERVCONF_H
   
   #include "buffer.h"
   
 #define MAX_PORTS               256     /* Max # ports. */  #define MAX_PORTS               256     /* Max # ports. */
   
 #define MAX_ALLOW_USERS         256     /* Max # users on allow list. */  #define MAX_ALLOW_USERS         256     /* Max # users on allow list. */
Line 25 
Line 27 
 #define MAX_SUBSYSTEMS          256     /* Max # subsystems. */  #define MAX_SUBSYSTEMS          256     /* Max # subsystems. */
 #define MAX_HOSTKEYS            256     /* Max # hostkeys. */  #define MAX_HOSTKEYS            256     /* Max # hostkeys. */
 #define MAX_ACCEPT_ENV          256     /* Max # of env vars. */  #define MAX_ACCEPT_ENV          256     /* Max # of env vars. */
 #define MAX_MATCH_GROUPS        256     /* Max # of groups for Match. */  
   
 /* permit_root_login */  /* permit_root_login */
 #define PERMIT_NOT_SET          -1  #define PERMIT_NOT_SET          -1
Line 110 
Line 111 
         u_int num_subsystems;          u_int num_subsystems;
         char   *subsystem_name[MAX_SUBSYSTEMS];          char   *subsystem_name[MAX_SUBSYSTEMS];
         char   *subsystem_command[MAX_SUBSYSTEMS];          char   *subsystem_command[MAX_SUBSYSTEMS];
         char   *subsystem_args[MAX_SUBSYSTEMS];  
   
         u_int num_accept_env;          u_int num_accept_env;
         char   *accept_env[MAX_ACCEPT_ENV];          char   *accept_env[MAX_ACCEPT_ENV];
Line 134 
Line 134 
         char   *authorized_keys_file;   /* File containing public keys */          char   *authorized_keys_file;   /* File containing public keys */
         char   *authorized_keys_file2;          char   *authorized_keys_file2;
   
         char   *adm_forced_command;  
   
         int     permit_tun;          int     permit_tun;
   
         int     num_permitted_opens;  
 }       ServerOptions;  }       ServerOptions;
   
 void     initialize_server_options(ServerOptions *);  void     initialize_server_options(ServerOptions *);
 void     fill_default_server_options(ServerOptions *);  void     fill_default_server_options(ServerOptions *);
 int      process_server_config_line(ServerOptions *, char *, const char *, int,  int      process_server_config_line(ServerOptions *, char *, const char *, int);
              int *, const char *, const char *, const char *);  
 void     load_server_config(const char *, Buffer *);  void     load_server_config(const char *, Buffer *);
 void     parse_server_config(ServerOptions *, const char *, Buffer *,  void     parse_server_config(ServerOptions *, const char *, Buffer *);
              const char *, const char *, const char *);  
 void     parse_server_match_config(ServerOptions *, const char *, const char *,  
              const char *);  
 void     copy_set_server_options(ServerOptions *, ServerOptions *);  
   
 #endif                          /* SERVCONF_H */  #endif                          /* SERVCONF_H */

Legend:
Removed from v.1.71.4.2  
changed lines
  Added in v.1.72