X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/9108f8d92b8e2b4b5fe61eb8e419bf94ba216d44..c8b33f201dc1568673002a11f4307700e502d0d6:/openssh/logintest.c

diff --git a/openssh/logintest.c b/openssh/logintest.c
index 7e9fbbf..aa3f5f4 100644
--- a/openssh/logintest.c
+++ b/openssh/logintest.c
@@ -9,6 +9,11 @@
  * 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
@@ -31,10 +36,6 @@
 
 #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>
@@ -47,7 +48,13 @@
 
 #include "loginrec.h"
 
+RCSID("$Id$");
+
+#ifdef HAVE___PROGNAME
 extern char *__progname;
+#else
+char *__progname;
+#endif
 
 #define PAUSE_BEFORE_LOGOUT 3
 
@@ -285,7 +292,7 @@ main(int argc, char *argv[])
 {
 	printf("Platform-independent login recording test driver\n");
 
-	__progname = ssh_get_progname(argv[0]);
+	__progname = get_progname(argv[0]);
 	if (argc == 2) {
 		if (strncmp(argv[1], "-i", 3) == 0)
 			compile_opts_only = 1;