- jmc@cvs.openbsd.org 2010/01/13 12:48:34

[openssh.git] / logintest.c

diff --git a/logintest.c b/logintest.c
index aa3f5f41f4e242b1e7188b19844d7d7b537d2ac5..7e9fbbfbbdc1e5a6cac726af7de233410e9438d8 100644 (file)
--- a/logintest.c
+++ b/logintest.c
@@ -9,11 +9,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Markus Friedl.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -36,6 +31,10 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -48,13 +47,7 @@
 
 #include "loginrec.h"
 
-RCSID("$Id$");
-
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 #define PAUSE_BEFORE_LOGOUT 3
 
@@ -292,7 +285,7 @@ main(int argc, char *argv[])
 {
        printf("Platform-independent login recording test driver\n");
 
-       __progname = get_progname(argv[0]);
+       __progname = ssh_get_progname(argv[0]);
        if (argc == 2) {
                if (strncmp(argv[1], "-i", 3) == 0)
                        compile_opts_only = 1;