+20000830
+ - (djm) Compile warning fixes from Mark Miller <markm@swoon.net>
+
20000829
- (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert
Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "includes.h"
#ifndef HAVE_DAEMON
static char rcsid[] = "$OpenBSD: daemon.c,v 1.2 1996/08/19 08:22:13 tholo Exp $";
#endif /* LIBC_SCCS and not lint */
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
-
int
daemon(nochdir, noclose)
int nochdir, noclose;
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "includes.h"
#ifndef HAVE_MKDTEMP
static char rcsid[] = "$OpenBSD: mktemp.c,v 1.13 1998/06/30 23:03:13 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include "bsd-misc.h"
-#include "bsd-arc4random.h"
-
static int _gettemp(char *, int *, int, int);
int
#define DP_C_LDOUBLE 3
#define char_to_int(p) (p - '0')
-#define MAX(p,q) ((p >= q) ? p : q)
+#ifndef MAX
+# define MAX(p,q) ((p >= q) ? p : q)
+#endif
static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
{
void
do_authenticated2(void)
{
+#ifdef HAVE_LOGIN_CAP
struct passwd *pw;
+#endif
/*
* Cancel the alarm we set to limit the time taken for