From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 2646B3858D35 for ; Thu, 16 Mar 2023 11:58:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2646B3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 518291FE0E for ; Thu, 16 Mar 2023 11:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678967920; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Mj/MGhK0AHxkp8moLC7rHQRE9aESIgNtUQ4pRvQNTC8=; b=Ma7rzuGdipFkFhdPlOBatE9S6aHxSSBdrrwVUohv8bBQnfKcdUKKFRSkk7njYy/70Au8UX luZYs9cYO/jIbVnvF1DnO+oK4gwMwczYZtZMcckviTsN4zoDwezDxt9NSMTLrRJlqAC0CB M+T7F2VBPys4eHTr3b0pcgj54mYcTFI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678967920; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Mj/MGhK0AHxkp8moLC7rHQRE9aESIgNtUQ4pRvQNTC8=; b=eei5IbNKYKtC1btvy7/d21MAkTCtuwf2O9QVspGcevT+qLZpNoa6e+ieextsZr79MZ9Ofs wNWdUYC54degmFBA== Received: from hawking.suse.de (unknown [10.168.4.11]) by relay2.suse.de (Postfix) with ESMTP id 475EB2C141 for ; Thu, 16 Mar 2023 11:58:40 +0000 (UTC) Received: by hawking.suse.de (Postfix, from userid 17005) id 329DC4A093A; Thu, 16 Mar 2023 12:58:40 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] getlogin_r: fix missing fallback if loginid is unset (bug 30235) X-Yow: I want EARS! I want two ROUND BLACK EARS to make me feel warm 'n secure!! Date: Thu, 16 Mar 2023 12:58:40 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When /proc/self/loginid is not set, we should still fall back to using the traditional utmp lookup, instead of failing right away. --- sysdeps/unix/sysv/linux/getlogin_r.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c index 879df85a16..4ae9a53503 100644 --- a/sysdeps/unix/sysv/linux/getlogin_r.c +++ b/sysdeps/unix/sysv/linux/getlogin_r.c @@ -59,10 +59,7 @@ __getlogin_r_loginuid (char *name, size_t namesize) value of, (uid_t) -1, so check if that value is set and return early to avoid making unneeded nss lookups. */ if (uid == (uid_t) -1) - { - __set_errno (ENXIO); - return ENXIO; - } + return -1; struct passwd pwd; struct passwd *tpwd; -- 2.40.0 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."