From d8f4e799da11964b7c89b1600a5e70079e477a36 Mon Sep 17 00:00:00 2001 From: Ray Hayes Date: Tue, 25 Oct 2016 14:41:34 -0700 Subject: [PATCH] Revert "Fix to domain logon and minor reformats to scp." This reverts commit d4ff0731d327cec4718a4b7a739d270581e60533. --- contrib/win32/openssh/Win32-OpenSSH.VC.db | Bin 54595584 -> 54595584 bytes contrib/win32/win32compat/pwd.c | 22 ++----------------- scp.c | 25 ++++++++++++---------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/contrib/win32/openssh/Win32-OpenSSH.VC.db b/contrib/win32/openssh/Win32-OpenSSH.VC.db index abc8e442eb2a1aaacde49ae2e93ef680e0f9d9a7..2b7ed30cf1e754ae3e3dc948fb5323ec2c95f195 100644 GIT binary patch delta 15037 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 MpLTeJ%x$*(4_~sSi2wiq delta 16164 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 diff --git a/contrib/win32/win32compat/pwd.c b/contrib/win32/win32compat/pwd.c index 4e8242a..e5c9593 100644 --- a/contrib/win32/win32compat/pwd.c +++ b/contrib/win32/win32compat/pwd.c @@ -33,7 +33,6 @@ #include #include #include -#include #define SECURITY_WIN32 #include #include "inc\pwd.h" @@ -71,7 +70,6 @@ get_passwd(const char *user_utf8, LPWSTR user_sid) { wchar_t reg_path[MAX_PATH], profile_home[MAX_PATH]; HKEY reg_key = 0; int tmp_len = MAX_PATH; - PDOMAIN_CONTROLLER_INFOW pdc = NULL; errno = 0; @@ -100,26 +98,12 @@ get_passwd(const char *user_utf8, LPWSTR user_sid) { } if (user_sid == NULL) { - if (NetUserGetInfo(udom_utf16, uname_utf16, 23, &user_info) != NERR_Success) { - if (DsGetDcNameW(NULL, udom_utf16, NULL, NULL, DS_DIRECTORY_SERVICE_PREFERRED, &pdc) == ERROR_SUCCESS) { - if (NetUserGetInfo(pdc->DomainControllerName, uname_utf16, 23, &user_info) != NERR_Success || + if (NetUserGetInfo(udom_utf16, uname_utf16, 23, &user_info) != NERR_Success || ConvertSidToStringSidW(((LPUSER_INFO_23)user_info)->usri23_user_sid, &user_sid_local) == FALSE) { errno = ENOMEM; //?? goto done; - } } - else { - errno = ENOMEM; //?? - goto done; - } - } - else { - if (ConvertSidToStringSidW(((LPUSER_INFO_23)user_info)->usri23_user_sid, &user_sid_local) == FALSE) { - errno = ENOMEM; //?? - goto done; - } - } - user_sid = user_sid_local; + user_sid = user_sid_local; } if (swprintf(reg_path, MAX_PATH, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\%ls", user_sid) == MAX_PATH || @@ -151,8 +135,6 @@ done: LocalFree(user_sid_local); if (reg_key) RegCloseKey(reg_key); - if (pdc) - NetApiBufferFree(pdc); return ret; } diff --git a/scp.c b/scp.c index 38aed10..5d17447 100644 --- a/scp.c +++ b/scp.c @@ -1135,18 +1135,15 @@ main(int argc, char **argv) throughlocal = 1; break; case 'o': - addargs(&remote_remote_args, "-%c", ch); - addargs(&remote_remote_args, "%s", optarg); - addargs(&args, "-%c", ch); - addargs(&args, "%s", optarg); - break; - case 'c': + case 'c': addargs(&remote_remote_args, "-%c", ch); addargs(&remote_remote_args, "%s", optarg); addargs(&args, "-%c", ch); addargs(&args, "%s", optarg); - cipher = xstrdup(optarg);; + cipher = malloc(strlen(optarg) + 1); + if (cipher) + strcpy(cipher, optarg); break; case 'i': addargs(&remote_remote_args, "-%c", ch); @@ -1154,7 +1151,9 @@ main(int argc, char **argv) addargs(&args, "-%c", ch); addargs(&args, "%s", optarg); - identity = xstrdup(optarg);; + identity = malloc(strlen(optarg) + 1); + if (identity) + strcpy(identity, optarg); break; case 'F': addargs(&remote_remote_args, "-%c", ch); @@ -1162,7 +1161,9 @@ main(int argc, char **argv) addargs(&args, "-%c", ch); addargs(&args, "%s", optarg); - ssh_config = xstrdup(optarg);; + ssh_config = malloc(strlen(optarg) + 1); + if (ssh_config) + strcpy(ssh_config, optarg); break; case 'P': addargs(&remote_remote_args, "-p"); @@ -1170,7 +1171,9 @@ main(int argc, char **argv) addargs(&args, "-p"); addargs(&args, "%s", optarg); - port = xstrdup(optarg);; + port = malloc(strlen(optarg) + 1); + if (port) + strcpy(port, optarg); break; case 'B': addargs(&remote_remote_args, "\"-oBatchmode yes\""); @@ -1358,7 +1361,7 @@ toremote(char *targ, int argc, char **argv) return; } - for (i = 0; i < argc - 1; i++) { + for (i = 0; i < argc - 1; i++) { src = colon(argv[i]); if (src && throughlocal) { /* extended remote to remote */ *src++ = 0;