summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--bsd-daemon.c9
-rw-r--r--bsd-mktemp.c14
-rw-r--r--bsd-snprintf.c4
-rw-r--r--session.c2
5 files changed, 10 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 06f412a65..1fe68ed61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120000830
2 - (djm) Compile warning fixes from Mark Miller <markm@swoon.net>
3
120000829 420000829
2 - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert 5 - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert
3 Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and 6 Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and
diff --git a/bsd-daemon.c b/bsd-daemon.c
index fe92b76b6..de829958c 100644
--- a/bsd-daemon.c
+++ b/bsd-daemon.c
@@ -31,7 +31,7 @@
31 * SUCH DAMAGE. 31 * SUCH DAMAGE.
32 */ 32 */
33 33
34#include "config.h" 34#include "includes.h"
35 35
36#ifndef HAVE_DAEMON 36#ifndef HAVE_DAEMON
37 37
@@ -39,13 +39,6 @@
39static char rcsid[] = "$OpenBSD: daemon.c,v 1.2 1996/08/19 08:22:13 tholo Exp $"; 39static char rcsid[] = "$OpenBSD: daemon.c,v 1.2 1996/08/19 08:22:13 tholo Exp $";
40#endif /* LIBC_SCCS and not lint */ 40#endif /* LIBC_SCCS and not lint */
41 41
42#include <fcntl.h>
43#include <unistd.h>
44
45#ifdef HAVE_PATHS_H
46# include <paths.h>
47#endif
48
49int 42int
50daemon(nochdir, noclose) 43daemon(nochdir, noclose)
51 int nochdir, noclose; 44 int nochdir, noclose;
diff --git a/bsd-mktemp.c b/bsd-mktemp.c
index 23831fa91..e8ffd0219 100644
--- a/bsd-mktemp.c
+++ b/bsd-mktemp.c
@@ -34,7 +34,7 @@
34 * SUCH DAMAGE. 34 * SUCH DAMAGE.
35 */ 35 */
36 36
37#include "config.h" 37#include "includes.h"
38 38
39#ifndef HAVE_MKDTEMP 39#ifndef HAVE_MKDTEMP
40 40
@@ -42,18 +42,6 @@
42static char rcsid[] = "$OpenBSD: mktemp.c,v 1.13 1998/06/30 23:03:13 deraadt Exp $"; 42static char rcsid[] = "$OpenBSD: mktemp.c,v 1.13 1998/06/30 23:03:13 deraadt Exp $";
43#endif /* LIBC_SCCS and not lint */ 43#endif /* LIBC_SCCS and not lint */
44 44
45#include <sys/types.h>
46#include <sys/stat.h>
47#include <fcntl.h>
48#include <errno.h>
49#include <stdio.h>
50#include <stdlib.h>
51#include <ctype.h>
52#include <unistd.h>
53
54#include "bsd-misc.h"
55#include "bsd-arc4random.h"
56
57static int _gettemp(char *, int *, int, int); 45static int _gettemp(char *, int *, int, int);
58 46
59int 47int
diff --git a/bsd-snprintf.c b/bsd-snprintf.c
index 4716ee291..5b674c569 100644
--- a/bsd-snprintf.c
+++ b/bsd-snprintf.c
@@ -116,7 +116,9 @@ static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c );
116#define DP_C_LDOUBLE 3 116#define DP_C_LDOUBLE 3
117 117
118#define char_to_int(p) (p - '0') 118#define char_to_int(p) (p - '0')
119#define MAX(p,q) ((p >= q) ? p : q) 119#ifndef MAX
120# define MAX(p,q) ((p >= q) ? p : q)
121#endif
120 122
121static void dopr (char *buffer, size_t maxlen, const char *format, va_list args) 123static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
122{ 124{
diff --git a/session.c b/session.c
index 4a77eef6b..3678b8f09 100644
--- a/session.c
+++ b/session.c
@@ -1837,7 +1837,9 @@ session_proctitle(Session *s)
1837void 1837void
1838do_authenticated2(void) 1838do_authenticated2(void)
1839{ 1839{
1840#ifdef HAVE_LOGIN_CAP
1840 struct passwd *pw; 1841 struct passwd *pw;
1842#endif
1841 1843
1842 /* 1844 /*
1843 * Cancel the alarm we set to limit the time taken for 1845 * Cancel the alarm we set to limit the time taken for