- (bal) OpenBSD Sync

   - markus@cvs.openbsd.org 2001/01/08 22:29:05
     [auth2.c compat.c compat.h servconf.c servconf.h sshd.8
      sshd_config version.h]
     implement option 'Banner /etc/issue.net' for ssh2, move version to
     2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner
     is enabled).
   - markus@cvs.openbsd.org 2001/01/08 22:03:23
     [channels.c ssh-keyscan.c]
     O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/08 21:55:41
     [sshconnect1.c]
     more cleanups and fixes from stevesk@pobox.com:
     1) try_agent_authentication() for loop will overwrite key just
        allocated with key_new(); don't alloc
     2) call ssh_close_authentication_connection() before exit
        try_agent_authentication()
     3) free mem on bad passphrase in try_rsa_authentication()
   - markus@cvs.openbsd.org 2001/01/08 21:48:17
     [kex.c]
     missing free; thanks stevesk@pobox.com

1 files changed, 8 insertions, 1 deletions

diff --git a/servconf.c b/servconf.c
index 6604e3d23..fb42d74ef 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.56 2001/01/07 11:28:06 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.57 2001/01/08 22:29:05 markus Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -78,6 +78,7 @@ initialize_server_options(ServerOptions *options)
         options->max_startups_begin = -1;
         options->max_startups_rate = -1;
         options->max_startups = -1;
+        options->banner = NULL;
 }
 
 void
@@ -198,6 +199,7 @@ typedef enum {
         sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sProtocol, sPidFile,
         sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
+        sBanner
 } ServerOpCodes;
 
 /* Textual representation of the tokens. */
@@ -257,6 +259,7 @@ static struct {
         { "gatewayports", sGatewayPorts },
         { "subsystem", sSubsystem },
         { "maxstartups", sMaxStartups },
+        { "banner", sBanner },
         { NULL, 0 }
 };
 
@@ -697,6 +700,10 @@ parse_flag:
                         intptr = &options->max_startups;
                         goto parse_int;
 
+                case sBanner:
+                        charptr = &options->banner;
+                        goto parse_filename;
+                        
                 default:
                         fprintf(stderr, "%s line %d: Missing handler for opcode %s (%d)\n",
                                 filename, linenum, arg, opcode);