[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.363 and 1.364

version 1.363, 2020/04/17 03:30:05 version 1.364, 2020/05/27 21:59:11
Line 61 
Line 61 
     const char *, int);      const char *, int);
 static void add_one_listen_addr(ServerOptions *, const char *,  static void add_one_listen_addr(ServerOptions *, const char *,
     const char *, int);      const char *, int);
 void parse_server_config_depth(ServerOptions *options, const char *filename,  static void parse_server_config_depth(ServerOptions *options,
     struct sshbuf *conf, struct include_list *includes,      const char *filename, struct sshbuf *conf, struct include_list *includes,
     struct connection_info *connectinfo, int flags, int *activep, int depth);      struct connection_info *connectinfo, int flags, int *activep, int depth);
   
 /* Use of privilege separation or not */  /* Use of privilege separation or not */
Line 2499 
Line 2499 
 #undef M_CP_STRARRAYOPT  #undef M_CP_STRARRAYOPT
   
 #define SERVCONF_MAX_DEPTH      16  #define SERVCONF_MAX_DEPTH      16
 void  static void
 parse_server_config_depth(ServerOptions *options, const char *filename,  parse_server_config_depth(ServerOptions *options, const char *filename,
     struct sshbuf *conf, struct include_list *includes,      struct sshbuf *conf, struct include_list *includes,
     struct connection_info *connectinfo, int flags, int *activep, int depth)      struct connection_info *connectinfo, int flags, int *activep, int depth)
Line 2525 
Line 2525 
         if (bad_options > 0)          if (bad_options > 0)
                 fatal("%s: terminating, %d bad configuration options",                  fatal("%s: terminating, %d bad configuration options",
                     filename, bad_options);                      filename, bad_options);
         process_queued_listen_addrs(options);  
 }  }
   
 void  void
Line 2536 
Line 2535 
         int active = connectinfo ? 0 : 1;          int active = connectinfo ? 0 : 1;
         parse_server_config_depth(options, filename, conf, includes,          parse_server_config_depth(options, filename, conf, includes,
             connectinfo, 0, &active, 0);              connectinfo, 0, &active, 0);
           process_queued_listen_addrs(options);
 }  }
   
 static const char *  static const char *

Legend:
Removed from v.1.363  
changed lines
  Added in v.1.364