From owner-svn-src-all@freebsd.org Sat Dec 19 02:42:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 808254B7628; Sat, 19 Dec 2020 02:42:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CyVPg3J14z4X93; Sat, 19 Dec 2020 02:42:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63B5915A66; Sat, 19 Dec 2020 02:42:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJ2gF9p041068; Sat, 19 Dec 2020 02:42:15 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJ2gFPK041067; Sat, 19 Dec 2020 02:42:15 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <202012190242.0BJ2gFPK041067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 19 Dec 2020 02:42:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368777 - head/usr.bin/login X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/usr.bin/login X-SVN-Commit-Revision: 368777 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 02:42:15 -0000 Author: pfg Date: Sat Dec 19 02:42:14 2020 New Revision: 368777 URL: https://svnweb.freebsd.org/changeset/base/368777 Log: Revert r368776: login(1): when exporting variables check the result of setenv(3) mismatch: the return value upon error is -1, so the code was not doing nothing. Modified: head/usr.bin/login/login.c Modified: head/usr.bin/login/login.c ============================================================================== --- head/usr.bin/login/login.c Sat Dec 19 02:23:53 2020 (r368776) +++ head/usr.bin/login/login.c Sat Dec 19 02:42:14 2020 (r368777) @@ -793,7 +793,6 @@ export(const char *s) char *p; const char **pp; size_t n; - int rv; if (strlen(s) > 1024 || (p = strchr(s, '=')) == NULL) return (0); @@ -805,10 +804,8 @@ export(const char *s) return (0); } *p = '\0'; - rv = setenv(s, p + 1, 1); + (void)setenv(s, p + 1, 1); *p = '='; - if (rv == 1) - return (0); return (1); }