Merge 4.0p1 to the trunk.

1 files changed, 43 insertions, 32 deletions

diff --git a/sshd.c b/sshd.c
index 19071c1bc..a2e0e9320 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.301 2004/08/11 11:50:09 dtucker Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.308 2005/02/08 22:24:57 dtucker Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -112,12 +112,6 @@ ServerOptions options;
 char *config_file_name = _PATH_SERVER_CONFIG_FILE;
 
 /*
- * Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
- * Default value is AF_UNSPEC means both IPv4 and IPv6.
- */
-int IPv4or6 = AF_UNSPEC;
-
-/*
  * Debug mode flag.  This can be set on the command line.  If debug
  * mode is enabled, extra debugging output will be sent to the system
  * log, the daemon will not go to background, and will exit after processing
@@ -750,7 +744,7 @@ get_hostkey_index(Key *key)
 static int
 drop_connection(int startups)
 {
-        double p, r;
+        int p, r;
 
         if (startups < options.max_startups_begin)
                 return 0;
@@ -761,12 +755,11 @@ drop_connection(int startups)
 
         p  = 100 - options.max_startups_rate;
         p *= startups - options.max_startups_begin;
-        p /= (double) (options.max_startups - options.max_startups_begin);
+        p /= options.max_startups - options.max_startups_begin;
         p += options.max_startups_rate;
-        p /= 100.0;
-        r = arc4random() / (double) UINT_MAX;
+        r = arc4random() % 100;
 
-        debug("drop_connection: p %g, r %g", p, r);
+        debug("drop_connection: p %d, r %d", p, r);
         return (r < p) ? 1 : 0;
 }
 
@@ -774,7 +767,7 @@ static void
 usage(void)
 {
         fprintf(stderr, "%s, %s\n",
-            SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
+            SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
         fprintf(stderr,
 "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n"
 "            [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n"
@@ -884,7 +877,7 @@ main(int ac, char **av)
         char ntop[NI_MAXHOST], strport[NI_MAXSERV];
         char *line;
         int listen_sock, maxfd;
-        int startup_p[2], config_s[2];
+        int startup_p[2] = { -1 , -1 }, config_s[2] = { -1 , -1 };
         int startups = 0;
         Key *key;
         Authctxt *authctxt;
@@ -921,10 +914,10 @@ main(int ac, char **av)
         while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqrtQR46")) != -1) {
                 switch (opt) {
                 case '4':
-                        IPv4or6 = AF_INET;
+                        options.address_family = AF_INET;
                         break;
                 case '6':
-                        IPv4or6 = AF_INET6;
+                        options.address_family = AF_INET6;
                         break;
                 case 'f':
                         config_file_name = optarg;
@@ -1030,7 +1023,6 @@ main(int ac, char **av)
                 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
         SSLeay_add_all_algorithms();
-        channel_set_af(IPv4or6);
 
         /*
          * Force logging to stderr until we have loaded the private host
@@ -1043,13 +1035,13 @@ main(int ac, char **av)
             SYSLOG_FACILITY_AUTH : options.log_facility,
             log_stderr || !inetd_flag);
 
-#ifdef _AIX
         /*
          * Unset KRB5CCNAME, otherwise the user's session may inherit it from
          * root's environment
          */ 
-        unsetenv("KRB5CCNAME");
-#endif /* _AIX */
+        if (getenv("KRB5CCNAME") != NULL)
+                unsetenv("KRB5CCNAME");
+
 #ifdef _UNICOS
         /* Cray can define user privs drop all privs now!
          * Not needed on PRIV_SU systems!
@@ -1080,13 +1072,16 @@ main(int ac, char **av)
         /* Fill in default values for those options not explicitly set. */
         fill_default_server_options(&options);
 
+        /* set default channel AF */
+        channel_set_af(options.address_family);
+
         /* Check that there are no remaining arguments. */
         if (optind < ac) {
                 fprintf(stderr, "Extra argument %s.\n", av[optind]);
                 exit(1);
         }
 
-        debug("sshd version %.100s", SSH_VERSION);
+        debug("sshd version %.100s", SSH_RELEASE);
 
         /* load private host keys */
         sensitive_data.host_keys = xmalloc(options.num_host_key_files *
@@ -1202,7 +1197,7 @@ main(int ac, char **av)
         }
 
         /* Initialize the log (it is reinitialized below in case we forked). */
-        if (debug_flag && !inetd_flag)
+        if (debug_flag && (!inetd_flag || rexeced_flag))
                 log_stderr = 1;
         log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
@@ -1278,10 +1273,12 @@ main(int ac, char **av)
                         if (num_listen_socks >= MAX_LISTEN_SOCKS)
                                 fatal("Too many listen sockets. "
                                     "Enlarge MAX_LISTEN_SOCKS");
-                        if (getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                        if ((ret = getnameinfo(ai->ai_addr, ai->ai_addrlen,
                             ntop, sizeof(ntop), strport, sizeof(strport),
-                            NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-                                error("getnameinfo failed");
+                            NI_NUMERICHOST|NI_NUMERICSERV)) != 0) {
+                                error("getnameinfo failed: %.100s",
+                                    (ret != EAI_SYSTEM) ? gai_strerror(ret) :
+                                    strerror(errno));
                                 continue;
                         }
                         /* Create socket for listening. */
@@ -1512,7 +1509,8 @@ main(int ac, char **av)
                                                 sock_in = newsock;
                                                 sock_out = newsock;
                                                 log_init(__progname, options.log_level, options.log_facility, log_stderr);
-                                                close(config_s[0]);
+                                                if (rexec_flag)
+                                                        close(config_s[0]);
                                                 break;
                                         }
                                 }
@@ -1637,6 +1635,9 @@ main(int ac, char **av)
         remote_port = get_remote_port();
         remote_ip = get_remote_ipaddr();
 
+#ifdef SSH_AUDIT_EVENTS
+        audit_connection_from(remote_ip, remote_port);
+#endif
 #ifdef LIBWRAP
         /* Check whether logins are denied from this host. */
         if (packet_connection_is_on_socket()) {
@@ -1673,9 +1674,6 @@ main(int ac, char **av)
 
         packet_set_nonblocking();
 
-        /* prepare buffers to collect authentication messages */
-        buffer_init(&loginmsg);
-
         /* allocate authentication context */
         authctxt = xmalloc(sizeof(*authctxt));
         memset(authctxt, 0, sizeof(*authctxt));
@@ -1683,13 +1681,13 @@ main(int ac, char **av)
         /* XXX global for cleanup, access from other modules */
         the_authctxt = authctxt;
 
+        /* prepare buffer to collect messages to display to user after login */
+        buffer_init(&loginmsg);
+
         if (use_privsep)
                 if (privsep_preauth(authctxt) == 1)
                         goto authenticated;
 
-        /* prepare buffer to collect messages to display to user after login */
-        buffer_init(&loginmsg);
-
         /* perform the key exchange */
         /* authenticate user and start session */
         if (compat20) {
@@ -1709,6 +1707,10 @@ main(int ac, char **av)
         }
 
  authenticated:
+#ifdef SSH_AUDIT_EVENTS
+        audit_event(SSH_AUTH_SUCCESS);
+#endif
+
         /*
          * In privilege separation, we fork another child and prepare
          * file descriptor passing.
@@ -1731,6 +1733,10 @@ main(int ac, char **av)
                 finish_pam();
 #endif /* USE_PAM */
 
+#ifdef SSH_AUDIT_EVENTS
+        PRIVSEP(audit_event(SSH_CONNECTION_CLOSE));
+#endif
+
         packet_close();
 
         if (use_privsep)
@@ -2022,5 +2028,10 @@ cleanup_exit(int i)
 {
         if (the_authctxt)
                 do_cleanup(the_authctxt);
+#ifdef SSH_AUDIT_EVENTS
+        /* done after do_cleanup so it can cancel the PAM auth 'thread' */
+        if (!use_privsep || mm_is_monitor())
+                audit_event(SSH_CONNECTION_ABANDON);
+#endif
         _exit(i);
 }