Bug 314 - switch to READPASSPHRASE_H to avoid conflicts with exiisting headers
Summary: switch to READPASSPHRASE_H to avoid conflicts with exiisting headers
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:48 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:48:09 AEST 
--- openbsd-compat/readpassphrase.h.orig        Sun Jan 27 19:18:10 2002
+++ openbsd-compat/readpassphrase.h     Sun Jan 27 19:18:54 2002
@@ -28,6 +28,6 @@
  */

-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
+#ifndef READPASSPHRASE_H_
+#define READPASSPHRASE_H_

 #include "includes.h"
@@ -43,6 +43,7 @@

 char *readpassphrase(const char *, char *, size_t, int);
-
+#else /* HAVE_READPASSPHRASE */
+#include <readpassphrase.h>
 #endif /* HAVE_READPASSPHRASE */

-#endif /* !_READPASSPHRASE_H_ */
+#endif /* !READPASSPHRASE_H_ */
Comment 1 Damien Miller 2002-10-21 10:40:18 AEST 
What existing headers? If the system provides its own readpassphrase() we should
need the local copy.
Comment 2 Dirk Meyer 2002-10-21 14:32:22 AEST 
Original report:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/34362

readpassphrase.h is detected better in openssh-3.2.3p1
so the problem is indeed fixed now.
Comment 3 Damien Miller 2004-04-14 12:24:18 AEST 
Mass change of RESOLVED bugs to CLOSED