summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--acconfig.h16
-rw-r--r--configure.in2
-rw-r--r--ssh-add.c4
-rw-r--r--sshd.c6
5 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 819549bc..953072fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
19991123
- Added SuSE package files from Chris Saia <csaia@wtower.com>
- - Restructured package-related files under packages/
+ - Restructured package-related files under packages/*
- Added generic PAM config
+ - Numerous little Solaris fixes
19991122
- Make <enter> close gnome-ssh-askpass (Debian bug #50299)
diff --git a/acconfig.h b/acconfig.h
index 6459c637..86ce003a 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -68,17 +68,25 @@
/* ******************* Shouldn't need to edit below this line ************** */
-# include <sys/types.h> /* For u_intXX_t */
-# include <sys/socket.h> /* For SHUT_XXXX */
+#include <sys/types.h> /* For u_intXX_t */
+#include <sys/socket.h> /* For SHUT_XXXX */
#ifdef HAVE_PATHS_H
# include <paths.h> /* For _PATH_XXX */
#endif
+#ifdef HAVE_UTMP_H
+# include <utmp.h> /* For _PATH_XXX */
+#endif
+
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h> /* For timersub */
#endif
+#ifdef HAVE_MAILLOCK_H
+#include <maillock.h>
+#endif
+
#ifndef SHUT_RDWR
enum
{
@@ -176,6 +184,10 @@ enum
# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin:"
#endif
+#ifndef _PATH_DEVNULL
+# define _PATH_DEVNULL "/dev/null"
+#endif
+
#ifndef _PATH_MAILDIR
# ifdef MAILDIR
# define _PATH_MAILDIR MAILDIR
diff --git a/configure.in b/configure.in
index 709e289b..73635272 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AC_CHECK_LIB(dl, dlopen, , )
AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files.
-AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h sys/select.h sys/time.h)
+AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h utmp.h sys/select.h sys/time.h)
dnl Checks for library functions.
AC_CHECK_FUNCS(openpty strlcpy strlcat mkdtemp arc4random setproctitle setlogin setenv)
diff --git a/ssh-add.c b/ssh-add.c
index ba8a964b..a9591441 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -14,7 +14,7 @@ Adds an identity to the authentication server, or removes an identity.
*/
#include "includes.h"
-RCSID("$Id: ssh-add.c,v 1.11 1999/11/22 07:11:23 damien Exp $");
+RCSID("$Id: ssh-add.c,v 1.12 1999/11/23 00:24:32 damien Exp $");
#include "rsa.h"
#include "ssh.h"
@@ -184,8 +184,6 @@ main(int argc, char **argv)
/* check if RSA support exists */
if (rsa_alive() == 0) {
- extern char *__progname;
-
fprintf(stderr,
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
__progname);
diff --git a/sshd.c b/sshd.c
index e8781076..5718eae9 100644
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@ agent connections.
*/
#include "includes.h"
-RCSID("$Id: sshd.c,v 1.28 1999/11/22 03:27:24 damien Exp $");
+RCSID("$Id: sshd.c,v 1.29 1999/11/23 00:24:32 damien Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -32,10 +32,6 @@ RCSID("$Id: sshd.c,v 1.28 1999/11/22 03:27:24 damien Exp $");
#include "uidswap.h"
#include "compat.h"
-#ifdef HAVE_MAILLOCK_H
-# include <maillock.h>
-#endif
-
#ifdef LIBWRAP
#include <tcpd.h>
#include <syslog.h>