openssh unix dev - Dec 1999 - bsd-login.c in pre17

Just a small fix:

if #ifdef is given multiple arguments, it only evaluates the first
and ignores the rest of the line...

Also added #include <string.h> to prevent compiler warning about
strncmp in login.

enjoy,

-dagraz

--- bsd-login.c.orig    Thu Dec  9 14:52:27 1999
+++ bsd-login.c Thu Dec  9 14:58:42 1999
@@ -52,6 +52,7 @@
 # include <utmp.h>
 #endif
 #include <stdio.h>
+#include <string.h>
 
 void
 login(utp)
@@ -78,7 +79,7 @@
 
        tty = ttyslot();
        if (tty > 0 && (fd = open(_PATH_UTMP, O_RDWR|O_CREAT,
0644))
>= 0) {
-#ifdef HAVE_HOST_IN_UTMP || HAVE_HOST_IN_UTMPX
+#if defined(HAVE_HOST_IN_UTMP) || defined(HAVE_HOST_IN_UTMPX)
                (void)lseek(fd, (off_t)(tty * sizeof(struct
UTMP_STR)), SEEK_SET);
                /*
                 * Prevent luser from zero'ing out ut_host.



_____________________________________________________
Sent by Jahoopa Free Email!
Find us on the web at http://www.jahoopa.com
Join today!

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 9 Dec 1999, David Agraz wrote:
> 
> Just a small fix:
> 
> if #ifdef is given multiple arguments, it only evaluates the first
> and ignores the rest of the line...
> 
> Also added #include <string.h> to prevent compiler warning about
> strncmp in login.
Applied, thanks.

Damien

- --
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.0 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE4ULwvormJ9RG1dI8RAsV2AJ9VaB/cuQuiGR7cYZtTICTdYJVHFwCcDryR
GpzMawfSE9Uv3DqgeKP1l1Q=Zt+w
-----END PGP SIGNATURE-----