From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 57672 invoked by alias); 10 Sep 2015 17:23:03 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 57626 invoked by uid 9078); 10 Sep 2015 17:23:03 -0000 Date: Thu, 10 Sep 2015 17:23:00 -0000 Message-ID: <20150910172303.57600.qmail@sourceware.org> From: corinna@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [csih] branch master, updated. 87a95f05e40697ea96ecd2b83145d20642db4cf9 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: abe9425b165b879429b153ec2d2889c702031e08 X-Git-Newrev: 87a95f05e40697ea96ecd2b83145d20642db4cf9 X-SW-Source: 2015-q3/txt/msg00020.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-csih.git;h=87a95f05e40697ea96ecd2b83145d20642db4cf9 commit 87a95f05e40697ea96ecd2b83145d20642db4cf9 Author: Takashi Yano 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 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}"