--- openssh-3.6.1p1/openbsd-compat/xmmap.c.orig	2003-04-11 17:51:03 +0400
+++ openssh-3.6.1p1/openbsd-compat/xmmap.c	2003-04-11 18:05:56 +0400
@@ -61,6 +61,8 @@ void *xmmap(size_t size)
 	{
 		int shmid;
 
+		verbose("mmap(%ld,MAP_ANON|MAP_SHARED) failed [%s], trying shmget(IPC_PRIVATE)",
+			(unsigned long) size, strerror(errno));
 		shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|S_IRUSR|S_IWUSR);
 # ifdef HAVE_MMAP
 		if (shmid != -1) {
@@ -89,12 +91,14 @@ void *xmmap(size_t size)
 #endif /* HAVE_SHMGET */
 
 #ifdef HAVE_MMAP
-#define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX"
+#define MM_SWAP_TEMPLATE "/var/run/sshd/mm.XXXXXXXX"
 	{
 		char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE;
 		int tmpfd;
 		int save_errno;
 
+		verbose("shmget(IPC_PRIVATE) also failed [%s], trying mmap(MAP_SHARED)",
+			strerror(errno));
 		tmpfd = mkstemp(tmpname);
 		if (tmpfd == -1)
 			fatal("mkstemp(\"%s\"): %s",