Date: Sat, 8 Aug 2020 03:19:05 +0200 From: Mateusz Guzik <mjguzik@gmail.com> To: Alex Richardson <arichardson@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r363992 - head/usr.sbin/pwd_mkdb Message-ID: <CAGudoHHX9EhV4TrRiEz8=m22kOZW5CxKvf2ezN77oZkRbbceLg@mail.gmail.com> In-Reply-To: <202008062046.076KkDSc013901@repo.freebsd.org> References: <202008062046.076KkDSc013901@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This broke i386 builds:
/usr/src/usr.bin/chpass/field.c:175:15: error: incompatible pointer
types passing
'_bootstrap_time_t *' (aka 'unsigned long long *') to parameter
of type 'time_t *'
(aka 'int *') [-Werror,-Wincompatible-pointer-types]
if (!atot(p, &pw->pw_change))
^~~~~~~~~~~~~~
/usr/src/usr.bin/chpass/chpass.h:67:27: note: passing argument to parameter here
int atot(char *, time_t *);
^
/usr/src/usr.bin/chpass/field.c:185:15: error: incompatible pointer
types passing
'_bootstrap_time_t *' (aka 'unsigned long long *') to parameter
of type 'time_t *'
(aka 'int *') [-Werror,-Wincompatible-pointer-types]
if (!atot(p, &pw->pw_expire))
^~~~~~~~~~~~~~
/usr/src/usr.bin/chpass/chpass.h:67:27: note: passing argument to parameter here
int atot(char *, time_t *);
^
On 8/6/20, Alex Richardson <arichardson@freebsd.org> wrote:
> Author: arichardson
> Date: Thu Aug 6 20:46:13 2020
> New Revision: 363992
> URL: https://svnweb.freebsd.org/changeset/base/363992
>
> Log:
> Allow bootstrapping pwd_mkdb on Linux/macOS
>
> We need to provide a struct passwd that is compatible with the target
> system and this is not the case when cross-building from macOS/Linux.
> It should also be a problem when bootstrapping for an i386 target from a
> FreeBSD amd64 host since time_t does not match across those systems.
> However, pwd_mkdb always truncates integer values to 32-bit so this
> difference does not result in different databases.
>
> Reviewed By: brooks
> Differential Revision: https://reviews.freebsd.org/D25931
>
> Added:
> head/usr.sbin/pwd_mkdb/pwd.h (contents, props changed)
> Modified:
> head/usr.sbin/pwd_mkdb/Makefile
>
> Modified: head/usr.sbin/pwd_mkdb/Makefile
> ==============================================================================
> --- head/usr.sbin/pwd_mkdb/Makefile Thu Aug 6 20:44:40 2020 (r363991)
> +++ head/usr.sbin/pwd_mkdb/Makefile Thu Aug 6 20:46:13 2020 (r363992)
> @@ -9,5 +9,8 @@ MAN= pwd_mkdb.8
> SRCS= pw_scan.c pwd_mkdb.c
>
> CFLAGS+= -I${SRCTOP}/lib/libc/gen # for pw_scan.h
> +.if defined(BOOTSTRAPPING)
> +CFLAGS+=-I${.CURDIR}
> +.endif
>
> .include <bsd.prog.mk>
>
> Added: head/usr.sbin/pwd_mkdb/pwd.h
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/usr.sbin/pwd_mkdb/pwd.h Thu Aug 6 20:46:13 2020 (r363992)
> @@ -0,0 +1,66 @@
> +/*-
> + * SPDX-License-Identifier: BSD-2-Clause
> + *
> + * Copyright 2018-2020 Alex Richardson <arichardson@FreeBSD.org>
> + *
> + * This software was developed by SRI International and the University of
> + * Cambridge Computer Laboratory (Department of Computer Science and
> + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of
> the
> + * DARPA SSITH research programme.
> + *
> + * This software was developed by SRI International and the University of
> + * Cambridge Computer Laboratory under DARPA/AFRL contract
> (FA8750-10-C-0237)
> + * ("CTSRD"), as part of the DARPA CRASH research programme.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
> PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
> WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.
> + *
> + * $FreeBSD$
> + */
> +
> +/*
> + * When building pwd_mkdb we need to use target systems definition of
> + * struct passwd. This protects against future changes to struct passwd
> and
> + * is essential to allow cross-building from Linux/macOS hosts since the
> + * structure is not compatible there.
> + */
> +#include <stdint.h>
> +#include <stddef.h>
> +/*
> + * Note: pwd_mkdb always stores uint32_t for all integer fields (including
> + * time_t!) so these definitions do not need to match sys/sys/_types.h
> + */
> +typedef uint32_t _bootstrap_gid_t;
> +typedef uint32_t _bootstrap_uid_t;
> +typedef uint64_t _bootstrap_time_t;
> +#define _GID_T_DECLARED
> +#define _TIME_T_DECLARED
> +#define _UID_T_DECLARED
> +#define _SIZE_T_DECLARED
> +
> +#define gid_t _bootstrap_gid_t
> +#define uid_t _bootstrap_uid_t
> +#define time_t _bootstrap_time_t
> +#define passwd _bootstrap_passwd
> +#include "../../include/pwd.h"
> +#undef gid_t
> +#undef uid_t
> +#undef time_t
>
--
Mateusz Guzik <mjguzik gmail.com>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHHX9EhV4TrRiEz8=m22kOZW5CxKvf2ezN77oZkRbbceLg>