diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | monitor_mm.c | 2 | ||||
-rw-r--r-- | openbsd-compat/xmmap.c | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20041006 | 1 | 20041006 |
2 | - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode | 2 | - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode |
3 | and other PAM platforms. | 3 | and other PAM platforms. |
4 | - (dtucker) [monitor_mm.c openbsd-compat/xmmap.c] Bug #940: cast constants | ||
5 | to void * to appease picky compilers (eg Tru64's "cc -std1"). | ||
4 | 6 | ||
5 | 20040930 | 7 | 20040930 |
6 | - (dtucker) [configure.ac] Set AC_PACKAGE_NAME. ok djm@ | 8 | - (dtucker) [configure.ac] Set AC_PACKAGE_NAME. ok djm@ |
@@ -1761,4 +1763,4 @@ | |||
1761 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1763 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1762 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1764 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1763 | 1765 | ||
1764 | $Id: ChangeLog,v 1.3557 2004/10/06 10:09:32 dtucker Exp $ | 1766 | $Id: ChangeLog,v 1.3558 2004/10/06 13:15:44 dtucker Exp $ |
diff --git a/monitor_mm.c b/monitor_mm.c index ff523a5b1..b0ec37cff 100644 --- a/monitor_mm.c +++ b/monitor_mm.c | |||
@@ -92,7 +92,7 @@ mm_create(struct mm_master *mmalloc, size_t size) | |||
92 | mm->mmalloc = mmalloc; | 92 | mm->mmalloc = mmalloc; |
93 | 93 | ||
94 | address = xmmap(size); | 94 | address = xmmap(size); |
95 | if (address == MAP_FAILED) | 95 | if (address == (void *)MAP_FAILED) |
96 | fatal("mmap(%lu): %s", (u_long)size, strerror(errno)); | 96 | fatal("mmap(%lu): %s", (u_long)size, strerror(errno)); |
97 | 97 | ||
98 | mm->address = address; | 98 | mm->address = address; |
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index c8d59dee0..74e8a8b13 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* $Id: xmmap.c,v 1.5 2004/08/14 13:55:38 dtucker Exp $ */ | 26 | /* $Id: xmmap.c,v 1.6 2004/10/06 13:15:44 dtucker Exp $ */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | 29 | ||
@@ -47,7 +47,7 @@ void *xmmap(size_t size) | |||
47 | # endif | 47 | # endif |
48 | 48 | ||
49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" | 49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" |
50 | if (address == MAP_FAILED) { | 50 | if (address == (void *)MAP_FAILED) { |
51 | char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; | 51 | char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; |
52 | int tmpfd; | 52 | int tmpfd; |
53 | mode_t old_umask; | 53 | mode_t old_umask; |