From nobody Tue May 30 17:05:15 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVzL31Vb3z4Xpwj for ; Tue, 30 May 2023 17:05:31 +0000 (UTC) (envelope-from yetoohappy@gmail.com) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVzL26zQTz3QMm for ; Tue, 30 May 2023 17:05:30 +0000 (UTC) (envelope-from yetoohappy@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-96f5d651170so441466b.1 for ; Tue, 30 May 2023 10:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685466328; x=1688058328; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=DactT0CDu5CMwtrEQFbKRs2ZO7/LmVhwmXToAA87BzY=; b=fqxaFM1gHfl3hN3eU+ealJzo70RU7GA2porUChiSjsU6LYfJywdPoHt3Cqi3oLuGdM YEkXY3gwsVDXXJpss3eezkokwNS/KWx8VD40IgsSqHjbHw+RpWW+rB29m9VKYcNYdtOy wCsiYGFWjwigV2vj5pCiE5iEjfwuHTbq4sicituWrPixvHrO11ajZ+6nXpPOxhA26Dlk fVKWS0OtFwwPlkRgVAnlT2/dobKV5j+2anNrHM3TuDfGHxE885urSU2a+o9Kqt5lDYO5 I+xXfdz7pXs60YqJfDSa6htxbfT6zp3XWgt8AEmLMA5ymVfVVpEeQeU4gnrSjpMssH9X BJPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685466328; x=1688058328; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DactT0CDu5CMwtrEQFbKRs2ZO7/LmVhwmXToAA87BzY=; b=RvUZ9eJ/iTdhc62BamDwGl4YhR5/gE7EFl0/qTIB6yu3FwtO33qIldL4gQO49floTp R80XpmAB3pHRU0+4TIF3E19LvgPKuIDqZJGQzDcahi6sOuVh1E+X0ZVM1MgfNeVNLKDk bXKDuUgwy16F+DsbhjejuakjumjGBQ5W8NrQX7UoVcmX9ztyEVrMyoevdB1BIuOVO+tk VUCGS1FLmgp4q+k6kSeFNQUFQG+J+oEDYlJkHmgNJrmjGECi31TFUMqJpjK8oqnebXDa eUPud/Ce8BErZHbtKddKxrWXEkkwQ/niPKos88YYovg7EOSkbCe9KQyq1ofmLfP/RZ4z 51UA== X-Gm-Message-State: AC+VfDyaZsqtuQE2OVVR+1CF9oOiXsVozAV0rxi2MqP+ZKhHLfQDhHuj WHD2DIqBevhXjmoXdCme0MBMjLKxr1/A2vJ8PM8= X-Google-Smtp-Source: ACHHUZ5gYHgmduUCDEiNLagKrti2bvvrCmBk9pSe71p2gM/0AfzQBLfu4t/Fyyty/4S4ihvlw9Qvci7fSBmJV8aibGY= X-Received: by 2002:a17:906:ee88:b0:96f:aed9:2520 with SMTP id wt8-20020a170906ee8800b0096faed92520mr2583216ejb.21.1685466327529; Tue, 30 May 2023 10:05:27 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <945C9B6D-F2A8-4F0D-BDB0-49A3DE870168@karels.net> <61e30711-f0da-2f42-3a6f-9bd91fc6b1ce@aetern.org> <20230530084133.Horde.4VevT2KY4XCtqoJgvP08jyB@webmail.leidinger.net> In-Reply-To: From: Yetoo Date: Tue, 30 May 2023 10:05:15 -0700 Message-ID: Subject: Re: Surprise null root password To: bob prohaska Cc: Alexander Leidinger , Yuri , freebsd-current@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QVzL26zQTz3QMm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Tue, May 30, 2023 at 8:36=E2=80=AFAM bob prohaska w= rote: > > On Tue, May 30, 2023 at 08:41:33AM +0200, Alexander Leidinger wrote: > > > > Quoting bob prohaska (from Fri, 26 May 2023 16:26:= 06 > > -0700): > > > > > On Fri, May 26, 2023 at 10:55:49PM +0200, Yuri wrote: > > > > > > > > The question is how you update the configuration files, > > > > mergemaster/etcupdate/something else? > > > > > > > > > > Via etcupdate after installworld. In the event the system > > > requests manual intervention I accept "theirs all". It seems > > > odd if that can null a root password. > > > > > > Still, it does seem an outside possibility. I could see it adding > > > system users, but messing with root's existing password seems a > > > bit unexpected. > > > > As you are posting to -current@, I expect you to report this issue abou= t > > 14-current systems. As such: there was a "recent" change (2021-10-20) t= o the > > root entry to change the shell. > > https://cgit.freebsd.org/src/commit/etc/master.passwd?id=3Dd410b585b6f0= 0a26c2de7724d6576a3ea7d548b7 > > > > By blindly accepting all changes, this has reset the PW to the default > > setting (empty). > > So it's a line-by-line merge. That's the most sensible explanation availa= ble. > > > > > I suggest to review changes ("df" instead of "tf" in etcupdate) to at l= east > > those files which you know you have modified, including the password/gr= oup > > stuff. After that you can decide if the diff which is shown with "df" c= an be > > applied ("tf"), or if you want to keep the old version ("mf"), or if yo= u > > want to modify the current file ("e", with both versions present in the= file > > so that you can copy/paste between the different versions and keep what= you > > need). > > > > The key sequences required to copy and paste between files in the edit sc= reen > were elusive. Probably it was thought self-evident, but not for me. I las= t tried > it long ago, via mergemaster. Is there is a guide to commands for merging= files > using /etcupdate? Is it in the vi man page? I couldn't find it. > > Thanks for writing! > > bob prohaska > > It's been a while for me so I forget if etcupdate resolve is automatic or there is a prompt or message about it, but the guide at https://docs.freebsd.org/en/books/handbook/cutting-edge/#updating-src-compl= eting-merge-etcupdate says: If etcupdate(8) is not able to merge a file automatically, the merge conflicts can be resolved with manual interaction by issuing: # etcupdate resolve But this info is far below the steps at https://docs.freebsd.org/en/books/handbook/cutting-edge/#updating-src-quick= -start with section 25.6.6.1 also not being mentioned in the steps. Info on merge commands, regardless, is under the Resolve Mode description in the etcupdate man page https://man.freebsd.org/cgi/man.cgi?etcupdate.