Merge

Author: rayhayes

contrib/win32/openssh/Win32-OpenSSH.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "ssh.vcxproj", "{74E69D5E-A1EF-46EA-9173-19A412774104}"
 	ProjectSection(ProjectDependencies) = postProject

contrib/win32/openssh/version.rc

@@ -46,7 +46,6 @@
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING  0x4
 #endif
 
-HANDLE	hInputConsole = NULL;
 HANDLE	hOutputConsole = NULL;
 DWORD	dwSavedAttributes = 0;
 WORD	wStartingAttributes = 0;

contrib/win32/win32compat/console.c

@@ -88,6 +88,8 @@ int w32_getaddrinfo(const char *, const char *,
         const struct addrinfo *, struct addrinfo **);
 FILE* w32_fopen_utf8(const char *, const char *);
 int w32_ftruncate(int fd, off_t length);
+char* w32_programdir();
+
 
 /* Shutdown constants */
 #define SHUT_WR SD_SEND

contrib/win32/win32compat/inc/w32posix.h

@@ -141,3 +141,27 @@ utf16_to_utf8(const wchar_t* utf16) {
                 return NULL;
         return utf8;
 }
+
+static char* s_programdir = NULL;
+char* w32_programdir() {
+        if (s_programdir != NULL)
+                return s_programdir;
+
+        if ((s_programdir = utf16_to_utf8(_wpgmptr)) == NULL)
+                return NULL;
+
+        /* null terminate after directory path */
+        {
+                char* tail = s_programdir + strlen(s_programdir);
+                while (tail > s_programdir && *tail != '\\' && *tail != '/')
+                        tail--;
+
+                if (tail > s_programdir)
+                        *tail = '\0';
+                else
+                        *tail = '.'; /* current directory */
+        }
+
+        return s_programdir;
+
+}

contrib/win32/win32compat/misc.c

@@ -202,48 +202,6 @@ w32_getpwuid(uid_t uid) {
         return ret;
 }
 
-/* given a access token, find the domain name of user account of the access token */
-int GetDomainFromToken ( HANDLE *hAccessToken, UCHAR *domain, DWORD dwSize)
-{
-   UCHAR InfoBuffer[1000],username[200];
-   PTOKEN_USER pTokenUser = (PTOKEN_USER)InfoBuffer;
-   DWORD dwInfoBufferSize,dwAccountSize = 200, dwDomainSize = dwSize;
-   SID_NAME_USE snu;
-
-   domain[0] = '\0' ;
-   GetTokenInformation(*hAccessToken,TokenUser,InfoBuffer,
-						1000, &dwInfoBufferSize);
-
-   LookupAccountSid(NULL, pTokenUser->User.Sid, (LPSTR)username,
-				        &dwAccountSize,(LPSTR)domain, &dwDomainSize, &snu);
-   return 0;
-}
-
-/*
- * Retrieve user homedir from token, save it in static string
- * and return pointer to this string.
- *
- * userName - user's name (IN)
- * token    - logon user's token (IN)
- *
- * RETURNS: pointer to static string with homedir or NULL if fails.
- */
-
-#define SET_USER_ENV(folder_id, evn_variable) do  {                \
-       if (SHGetKnownFolderPath(&folder_id,0,token,&path) == S_OK)              \
-        {                                                                       \
-                SetEnvironmentVariableW(evn_variable, path);                    \
-                CoTaskMemFree(path);                                            \
-       }                                                                        \
-} while (0)                                                                     
-
-/*
- * Temporary getpwuid implementaion of Windows. This should be replaced with getpw_currentuser
- */
-
-
-
-
 
 /* TODO - this is moved from realpath.c in openbsdcompat. Review and finalize its position*/