From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13278 invoked by alias); 11 Mar 2016 21:52:39 -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 13093 invoked by uid 10076); 11 Mar 2016 21:52:38 -0000 Date: Fri, 11 Mar 2016 21:52:00 -0000 Message-ID: <20160311215238.13039.qmail@sourceware.org> From: gratz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [csih] branch master, updated. v0_9_9-1-g128ed70 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f5d9a40b1e8a5083f03c08b4761986a9f28f333f X-Git-Newrev: 128ed704ed13cda2f3b2e336dba4aeb27a70bdd6 X-SW-Source: 2016-q1/txt/msg00015.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-csih.git;h=128ed704ed13cda2f3b2e336dba4aeb27a70bdd6 commit 128ed704ed13cda2f3b2e336dba4aeb27a70bdd6 Author: Achim Gratz Date: Fri Mar 11 20:43:33 2016 +0100 Fix creation of privileged user in /etc/passwd * cygwin-service-installation-helper.sh (csih_create_privileged_user): The user name for the priviledged user is in ${csih_PRIVILEGED_USERNAME} in this function, so use this variable instead of ${username}. Reported and fix suggested by Nick Battle in https://cygwin.com/ml/cygwin/2016-03/msg00154.html Diff: --- cygwin-service-installation-helper.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cygwin-service-installation-helper.sh b/cygwin-service-installation-helper.sh index 10ab4fb..60d4bec 100755 --- a/cygwin-service-installation-helper.sh +++ b/cygwin-service-installation-helper.sh @@ -3066,7 +3066,7 @@ csih_create_privileged_user() # If we use /etc account DB only, write new account to /etc/passwd if csih_use_file_etc passwd then - /usr/bin/mkpasswd -l -u "${username}" >> "${SYSCONFDIR}/passwd" + /usr/bin/mkpasswd -l -u "${csih_PRIVILEGED_USERNAME}" >> "${SYSCONFDIR}/passwd" fi return "${ret}"