[csih] branch master, updated. 87a95f05e40697ea96ecd2b83145d20642db4cf9
corinna@sourceware.org
corinna@sourceware.org
Thu Sep 10 17:23:00 GMT 2015
https://sourceware.org/git/gitweb.cgi?p=cygwin-csih.git;h=87a95f05e40697ea96ecd2b83145d20642db4cf9
commit 87a95f05e40697ea96ecd2b83145d20642db4cf9
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu Sep 10 19:22:22 2015 +0200
Fix creating cyg_server user when running under Microsoft Account
Fixes https://cygwin.com/ml/cygwin/2015-06/msg00265.html
Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
Diff:
---
cygwin-service-installation-helper.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cygwin-service-installation-helper.sh b/cygwin-service-installation-helper.sh
index d3c98af..87993be 100755
--- a/cygwin-service-installation-helper.sh
+++ b/cygwin-service-installation-helper.sh
@@ -2866,7 +2866,8 @@ csih_select_privileged_username()
if ! csih_use_file_etc "passwd"
then
# This test succeeds on domain member machines only, not on DCs.
- if [ "\\\\${COMPUTERNAME,,*}" != "${LOGONSERVER,,*}" ]
+ if [ "\\\\${COMPUTERNAME,,*}" != "${LOGONSERVER,,*}" \
+ -a "${LOGONSERVER}" != "\\\\MicrosoftAccount" ]
then
# Lowercase of USERDOMAIN
csih_PRIVILEGED_USERNAME="${COMPUTERNAME,,*}+${username}"
More information about the Cygwin-apps-cvs
mailing list