From patchwork Sat Jan 1 16:53:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 49445 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 334F1385802A for ; Sat, 1 Jan 2022 16:53:32 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 27EDD3858D28 for ; Sat, 1 Jan 2022 16:53:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 27EDD3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9A84B1F7; Sat, 1 Jan 2022 17:53:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Si2r4vcpToOF; Sat, 1 Jan 2022 17:53:14 +0100 (CET) Received: from begin (unknown [IPv6:2a01:cb19:956:1b00:de41:a9ff:fe47:ec49]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 940664A; Sat, 1 Jan 2022 17:53:14 +0100 (CET) Received: from samy by begin with local (Exim 4.95) (envelope-from ) id 1n3hd1-009Djt-Qw; Sat, 01 Jan 2022 17:53:11 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [hurd, commited] hurd: Use __trivfs_server_name instead of trivfs_server_name Date: Sat, 1 Jan 2022 17:53:11 +0100 Message-Id: <20220101165311.2197758-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spamd-Bar: ++++ X-Rspamd-Server: hera Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Queue-Id: 9A84B1F7 X-Spamd-Result: default: False [4.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; MID_CONTAINS_FROM(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[] X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The latter violates namespace contraints --- sysdeps/mach/hurd/getrandom.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c index 24f9ac60f7..76f2e900d2 100644 --- a/sysdeps/mach/hurd/getrandom.c +++ b/sysdeps/mach/hurd/getrandom.c @@ -21,7 +21,7 @@ #include #include -extern char *trivfs_server_name __attribute__((weak)); +extern char *__trivfs_server_name __attribute__((weak)); /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ @@ -33,14 +33,14 @@ __getrandom (void *buffer, size_t length, unsigned int flags) size_t amount_read; int fd; - if (&trivfs_server_name && trivfs_server_name - && trivfs_server_name[0] == 'r' - && trivfs_server_name[1] == 'a' - && trivfs_server_name[2] == 'n' - && trivfs_server_name[3] == 'd' - && trivfs_server_name[4] == 'o' - && trivfs_server_name[5] == 'm' - && trivfs_server_name[6] == '\0') + if (&__trivfs_server_name && __trivfs_server_name + && __trivfs_server_name[0] == 'r' + && __trivfs_server_name[1] == 'a' + && __trivfs_server_name[2] == 'n' + && __trivfs_server_name[3] == 'd' + && __trivfs_server_name[4] == 'o' + && __trivfs_server_name[5] == 'm' + && __trivfs_server_name[6] == '\0') /* We are random, don't try to read ourselves! */ return length;