public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: corinna@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [csih - Cygwin service installation helper, a helper script and tools to create service installation scripts] branch master, updated. v0_9_11-1-g20c23cd Date: Mon, 18 Jun 2018 11:07:00 -0000 [thread overview] Message-ID: <20180618110758.2741.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/csih.git;h=20c23cd8e0d3e7c10f59d42fa9650c94628aef99 commit 20c23cd8e0d3e7c10f59d42fa9650c94628aef99 Author: Takashi Yano <takashi.yano@nifty.ne.jp> Date: Sat Jun 16 19:13:52 2018 +0900 Fix the test of whether the computer is on a domain. * cygwin-service-installation-helper.sh (csih_select_rivileged_username): In the case logged in as a local user, csih failed to judge to be on a domain even if the computer is on a domain. This is because ${LOGSERVER,,*} has the same value as \\\\${COMPUTERNAME,,*}. The fix is done to use cygwin username returned by mkpasswd command to check it instead. Also, testing has been changed so that USERDOMAIN is used instead of LOGONSERVER because LOGONSERVER may not be set if "Run as administrator" is used. See the post below for more detail. https://cygwin.com/ml/cygwin/2018-06/msg00166.html Diff: --- cygwin-service-installation-helper.sh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cygwin-service-installation-helper.sh b/cygwin-service-installation-helper.sh index abdb0ef..fbdff0d 100755 --- a/cygwin-service-installation-helper.sh +++ b/cygwin-service-installation-helper.sh @@ -2882,9 +2882,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,,*}" \ - -a "${LOGONSERVER}" != "" \ - -a "${LOGONSERVER}" != "\\\\MicrosoftAccount" ] + if [ "${USERDOMAIN,,*}" != "${COMPUTERNAME,,*}" \ + -o "$(/usr/bin/mkpasswd -c | /usr/bin/awk -F: '{print $1}')" = "${USERDOMAIN}+${USERNAME}" ] then # Lowercase of USERDOMAIN csih_PRIVILEGED_USERNAME="${COMPUTERNAME,,*}+${username}"
reply other threads:[~2018-06-18 11:07 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180618110758.2741.qmail@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).