Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2010-09-28 18:49:31 +0400
committerCorinna Vinschen <corinna@vinschen.de>2010-09-28 18:49:31 +0400
commit2a9b4b7aa07c166beca1c37d2ba7faa22feca33f (patch)
tree67fe89cf1747cf259bac0ea5cb66db10edb5ac34 /winsup/cygwin/passwd.cc
parent2f1f8815c037ee0387c30fba98689e544ab75c9a (diff)
Revert accidental previous login.
Diffstat (limited to 'winsup/cygwin/passwd.cc')
-rw-r--r--winsup/cygwin/passwd.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index 23756241a..8c51c22a0 100644
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -66,8 +66,7 @@ pwdgrp::read_passwd ()
if (!user_shared->cb || myself->uid == ILLEGAL_UID)
searchentry = !internal_getpwsid (tu);
if (searchentry
- && (!cygheap->user.name ()
- || !(pw = internal_getpwnam (cygheap->user.name ()))
+ && (!(pw = internal_getpwnam (cygheap->user.name ()))
|| !user_shared->cb
|| (myself->uid != ILLEGAL_UID
&& myself->uid != (__uid32_t) pw->pw_uid
@@ -76,7 +75,7 @@ pwdgrp::read_passwd ()
static char linebuf[1024]; // must be static and
// should not be NO_COPY
snprintf (linebuf, sizeof (linebuf), "%s:*:%lu:%lu:,%s:%s:/bin/sh",
- cygheap->user.name () ?: "",
+ cygheap->user.name (),
(!user_shared->cb || myself->uid == ILLEGAL_UID)
? UNKNOWN_UID : myself->uid,
!user_shared->cb ? UNKNOWN_GID : myself->gid,