[contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,

openbsd-compat/bsd-cygwin_util.h, openbsd-compat/daemon.c]
Allow SSHD to install as service under WIndows 9x/Me
[configure.ac] Fix to allow linking against PCRE on Cygwin
Patches by Corinna Vinschen <vinschen@redhat.com>

3 files changed, 28 insertions, 2 deletions

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 87f36c0cb..6d6aafa4f 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -15,7 +15,7 @@
 
 #include "includes.h"
 
-RCSID("$Id: bsd-cygwin_util.c,v 1.5 2001/07/18 16:19:49 mouring Exp $");
+RCSID("$Id: bsd-cygwin_util.c,v 1.6 2001/11/27 01:19:44 tim Exp $");
 
 #ifdef HAVE_CYGWIN
 
@@ -139,4 +139,26 @@ int check_ntsec(const char *filename)
         return 0;
 }
 
+void register_9x_service(void)
+{
+        HINSTANCE kerneldll;
+        DWORD (*RegisterServiceProcess)(DWORD, DWORD);
+
+        /* The service register mechanism in 9x/Me is pretty different from
+         * NT/2K/XP.  In NT/2K/XP we're using a special service starter
+         * application to register and control sshd as service.  This method
+         * doesn't play nicely with 9x/Me.  For that reason we register here
+         * as service when running under 9x/Me.  This function is only called
+         * by the child sshd when it's going to daemonize.
+         */
+        if (is_winnt)
+                return;
+        if (! (kerneldll = LoadLibrary("KERNEL32.DLL")))
+                return;
+        if (! (RegisterServiceProcess = (DWORD (*)(DWORD, DWORD))
+                          GetProcAddress(kerneldll, "RegisterServiceProcess")))
+                return;
+        RegisterServiceProcess(0, 1);
+}
+
 #endif /* HAVE_CYGWIN */
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 7879501e0..24063d311 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -13,7 +13,7 @@
  * binary mode on Windows systems.
  */
 
-/* $Id: bsd-cygwin_util.h,v 1.4 2001/04/13 14:28:43 djm Exp $ */
+/* $Id: bsd-cygwin_util.h,v 1.5 2001/11/27 01:19:44 tim Exp $ */
 
 #ifndef _BSD_CYGWIN_UTIL_H
 #define _BSD_CYGWIN_UTIL_H
@@ -26,6 +26,7 @@ int binary_open(const char *filename, int flags, ...);
 int binary_pipe(int fd[2]);
 int check_nt_auth(int pwd_authenticated, uid_t uid);
 int check_ntsec(const char *filename);
+void register_9x_service(void);
 
 #define open binary_open
 #define pipe binary_pipe
diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index f704a9048..7d23b2467 100644
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -49,6 +49,9 @@ daemon(nochdir, noclose)
         case -1:
                 return (-1);
         case 0:
+#ifdef HAVE_CYGWIN
+                register_9x_service();
+#endif
                 break;
         default:
 #ifdef HAVE_CYGWIN