Bug 315 - add missing includes and defines for FREEBSD
Summary: add missing includes and defines for FREEBSD
Status: CLOSED FIXED
Alias: None
Product: Portable OpenSSH
Classification: Unclassified
Component: Build system (show other bugs)
Version: -current
Hardware: Other FreeBSD
: P2 normal
Assignee: OpenSSH Bugzilla mailing list
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-06-28 15:50 AEST by Dirk Meyer
Modified: 2004-04-14 12:24 AEST (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dirk Meyer 2002-06-28 15:50:52 AEST 
--- session.c.orig      Wed Jun 26 15:51:06 2002
+++ session.c   Wed Jun 26 18:20:35 2002
@@ -64,6 +64,13 @@
 #define is_winnt       (GetVersion() < 0x80000000)
 #endif

+#ifdef __FreeBSD__
+#include <libutil.h>
+#include <syslog.h>
+#include <time.h>
+#define _PATH_CHPASS "/usr/bin/passwd"
+#endif /* __FreeBSD__ */ 
+
 /* func */

 Session *session_new(void);
Comment 1 Damien Miller 2002-10-21 10:41:31 AEST 
Why are these needed? time.h is already pulled in via includes.h
Comment 2 Dirk Meyer 2002-10-21 14:57:40 AEST 
used for calls to:
int     openpty __P((int *_amaster, int *_aslave, char *_name,
                     struct termios *_termp, struct winsize *_winp));

In openssh.3.5 this funtions have beenn moved to: sshpty.c
--- sshpty.c.orig       Wed Jun 26 01:21:42 2002
+++ sshpty.c    Fri Jun 28 07:09:38 2002
@@ -30,6 +30,9 @@
 #ifdef HAVE_PTY_H
 # include <pty.h>
 #endif
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
 # include <sys/stropts.h>
 #endif
Comment 3 Damien Miller 2002-10-21 20:25:25 AEST 
This should be fixes as part of bug 317 - libutil.h was added to includes.h if
it is present.
Comment 4 Damien Miller 2004-04-14 12:24:18 AEST 
Mass change of RESOLVED bugs to CLOSED