Re: svn commit: r358989 - in head/stand/efi: libefi loader loader/arch/arm loader/arch/arm64

[Alexey Dokuchaev]

On Sat, Mar 14, 2020 at 06:36:03AM +, Toomas Soome wrote:
> New Revision: 358989
> URL: https://svnweb.freebsd.org/changeset/base/358989
> 
> Log:
>   loader: add comconsole implementation on top of SIO protocol
> 
> [...]
> --- /dev/null 00:00:00 1970   (empty, because file is newly added)
> +++ head/stand/efi/loader/efiserialio.c   Sat Mar 14 06:36:03 2020
> (r358989)
> @@ -0,0 +1,518 @@
> +/*-
> + * Copyright (c) 1998 Michael Smith (msm...@freebsd.org)

If this is the new code, then copyright date and maybe attribution
seem wrong.  If this is the old code, why wasn't it repocopied?

./danfe
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359390 - stable/12/share/man/man5

[Mateusz Piotrowski]

Author: 0mp (doc,ports committer)
Date: Sat Mar 28 08:15:18 2020
New Revision: 359390
URL: https://svnweb.freebsd.org/changeset/base/359390

Log:
  MFC 359299:
  
  Fix formatting
  
  Previously, the whole "jail_* variables" string would be stylized
  as a variable. This is incorrect.

Modified:
  stable/12/share/man/man5/rc.conf.5
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man5/rc.conf.5
==
--- stable/12/share/man/man5/rc.conf.5  Sat Mar 28 04:02:00 2020
(r359389)
+++ stable/12/share/man/man5/rc.conf.5  Sat Mar 28 08:15:18 2020
(r359390)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2019
+.Dd March 25, 2020
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -3892,7 +3892,7 @@ When set to
 all configured jails in
 .Va jail_list
 are stopped in reverse order.
-.It Va jail_* variables
+.It Va jail_ Ns * variables
 Note that older releases supported per-jail configuration via
 .Nm
 variables.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359391 - stable/11/share/man/man5

[Mateusz Piotrowski]

Author: 0mp (doc,ports committer)
Date: Sat Mar 28 08:17:00 2020
New Revision: 359391
URL: https://svnweb.freebsd.org/changeset/base/359391

Log:
  MFC 359299:
  
  Fix formatting
  
  Previously, the whole "jail_* variables" string would be stylized
  as a variable. This is incorrect.

Modified:
  stable/11/share/man/man5/rc.conf.5
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man5/rc.conf.5
==
--- stable/11/share/man/man5/rc.conf.5  Sat Mar 28 08:15:18 2020
(r359390)
+++ stable/11/share/man/man5/rc.conf.5  Sat Mar 28 08:17:00 2020
(r359391)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2019
+.Dd March 25, 2020
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -4007,7 +4007,7 @@ When set to
 all configured jails in
 .Va jail_list
 are stopped in reverse order.
-.It Va jail_* variables
+.It Va jail_ Ns * variables
 Note that older releases supported per-jail configuration via
 .Nm
 variables.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359392 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Sat Mar 28 12:21:52 2020
New Revision: 359392
URL: https://svnweb.freebsd.org/changeset/base/359392

Log:
  ddb show pginfo: print pages reference value in hex.
  
  It is more useful this way after the VPRC_ flags were introduced.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c   Sat Mar 28 08:17:00 2020(r359391)
+++ head/sys/vm/vm_page.c   Sat Mar 28 12:21:52 2020(r359392)
@@ -5453,7 +5453,7 @@ DB_SHOW_COMMAND(pginfo, vm_page_print_pginfo)
else
m = (vm_page_t)addr;
db_printf(
-"page %p obj %p pidx 0x%jx phys 0x%jx q %d ref %u\n"
+"page %p obj %p pidx 0x%jx phys 0x%jx q %d ref 0x%x\n"
 "  af 0x%x of 0x%x f 0x%x act %d busy %x valid 0x%x dirty 0x%x\n",
m, m->object, (uintmax_t)m->pindex, (uintmax_t)m->phys_addr,
m->a.queue, m->ref_count, m->a.flags, m->oflags,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359393 - vendor/tcsh/dist

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 14:58:03 2020
New Revision: 359393
URL: https://svnweb.freebsd.org/changeset/base/359393

Log:
  tcsh: import 6974bc35a5cd
  
  This removes an extra variable definition that causes the -fno-common build
  to fail, which will be a new default in GCC10/LLVM11.

Modified:
  vendor/tcsh/dist/tc.sig.c

Modified: vendor/tcsh/dist/tc.sig.c
==
--- vendor/tcsh/dist/tc.sig.c   Sat Mar 28 12:21:52 2020(r359392)
+++ vendor/tcsh/dist/tc.sig.c   Sat Mar 28 14:58:03 2020(r359393)
@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
 int phup_disabled; /* = 0; */
 int pchild_disabled; /* = 0; */
 int pintr_disabled; /* = 0; */
-int handle_interrupt; /* = 0; */
 
 int
 handle_pending_signals(void)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359395 - head/share/man/man7

[Ed Maste]

Author: emaste
Date: Sat Mar 28 15:35:47 2020
New Revision: 359395
URL: https://svnweb.freebsd.org/changeset/base/359395

Log:
  arch.7: update Default Tool Chain section
  
  All architectures use Clang, lld, and ELF Tool Chain now.

Modified:
  head/share/man/man7/arch.7

Modified: head/share/man/man7/arch.7
==
--- head/share/man/man7/arch.7  Sat Mar 28 15:00:55 2020(r359394)
+++ head/share/man/man7/arch.7  Sat Mar 28 15:35:47 2020(r359395)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 23, 2020
+.Dd March 28, 2020
 .Dt ARCH 7
 .Os
 .Sh NAME
@@ -287,36 +287,13 @@ is 8 bytes on all supported architectures except i386.
 uses
 .Xr clang 1
 as the default compiler on all supported CPU architectures,
-as well as ELF Tool Chain binary utilities such as
+LLVM's
+.Xr ld.lld 1
+as the default linker, and
+ELF Tool Chain binary utilities such as
 .Xr objcopy 1
 and
 .Xr readelf 1 .
-Most supported CPU architectures also use LLVM's
-.Xr ld.lld 1
-as the linker.
-This table shows the default tool chain for each architecture.
-.Bl -column -offset indent "Architecture" "Compiler" "Linker"
-.It Sy Architecture Ta Sy Compiler Ta Sy Linker
-.It aarch64 Ta Clang Ta lld
-.It amd64   Ta Clang Ta lld
-.It armv6   Ta Clang Ta lld
-.It armv7   Ta Clang Ta lld
-.It i386Ta Clang Ta lld
-.It mipsTa Clang Ta lld
-.It mipsel  Ta Clang Ta lld
-.It mipselhfTa Clang Ta lld
-.It mipshf  Ta Clang Ta lld
-.It mipsn32 Ta Clang Ta lld
-.It mips64  Ta Clang Ta lld
-.It mips64elTa Clang Ta lld
-.It mips64elhf  Ta Clang Ta lld
-.It mips64hfTa Clang Ta lld
-.It powerpc Ta Clang Ta lld
-.It powerpcspe  Ta Clang Ta lld
-.It powerpc64   Ta Clang Ta lld
-.It riscv64 Ta Clang Ta lld
-.It riscv64sf   Ta Clang Ta lld
-.El
 .Ss MACHINE_ARCH vs MACHINE_CPUARCH vs MACHINE
 .Dv MACHINE_CPUARCH
 should be preferred in Makefiles when the generic
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359396 - head/sys/dev/sound/pci/hda

[Konstantin Belousov]

Author: kib
Date: Sat Mar 28 16:26:47 2020
New Revision: 359396
URL: https://svnweb.freebsd.org/changeset/base/359396

Log:
  hdaa: remove verbosity from the normal driver operations.
  
  If hdaa is used in polling mode, it logs each change to the poll
  interval under bootverbose, which makes it unusable (slow).  These
  messages are arguably useless or are a debugging leftovers at best.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:3 days

Modified:
  head/sys/dev/sound/pci/hda/hdac.c

Modified: head/sys/dev/sound/pci/hda/hdac.c
==
--- head/sys/dev/sound/pci/hda/hdac.c   Sat Mar 28 15:35:47 2020
(r359395)
+++ head/sys/dev/sound/pci/hda/hdac.c   Sat Mar 28 16:26:47 2020
(r359396)
@@ -1413,21 +1413,11 @@ hdac_poll_reinit(struct hdac_softc *sc)
pollticks >>= 1;
if (pollticks > hz)
pollticks = hz;
-   if (pollticks < 1) {
-   HDA_BOOTVERBOSE(
-   device_printf(sc->dev,
-   "poll interval < 1 tick !\n");
-   );
+   if (pollticks < 1)
pollticks = 1;
-   }
if (min > pollticks)
min = pollticks;
}
-   HDA_BOOTVERBOSE(
-   device_printf(sc->dev,
-   "poll interval %d -> %d ticks\n",
-   sc->poll_ival, min);
-   );
sc->poll_ival = min;
if (min == 100)
callout_stop(&sc->poll_callout);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359399 - in head/contrib/telnet: libtelnet telnetd

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:06:34 2020
New Revision: 359399
URL: https://svnweb.freebsd.org/changeset/base/359399

Log:
  telnet: remove some duplicate definitions, mark terminaltype extern
  
  Most of these were already properly declared and defined elsewhere, this is
  effectively just a minor cleanup that fixes the -fno-common build.
  
  -fno-common will become the default in GCC10/LLVM11.
  
  MFC after:3 days

Modified:
  head/contrib/telnet/libtelnet/encrypt.c
  head/contrib/telnet/telnetd/ext.h
  head/contrib/telnet/telnetd/sys_term.c
  head/contrib/telnet/telnetd/telnetd.c

Modified: head/contrib/telnet/libtelnet/encrypt.c
==
--- head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:02:32 2020
(r359398)
+++ head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:06:34 2020
(r359399)
@@ -69,13 +69,6 @@ static const char sccsid[] = "@(#)encrypt.c  8.2 (Berke
 #include "encrypt.h"
 #include "misc.h"
 
-/*
- * These functions pointers point to the current routines
- * for encrypting and decrypting data.
- */
-void   (*encrypt_output)(unsigned char *, int);
-int(*decrypt_input)(int);
-
 int EncryptType(char *type, char *mode);
 int EncryptStart(char *mode);
 int EncryptStop(char *mode);

Modified: head/contrib/telnet/telnetd/ext.h
==
--- head/contrib/telnet/telnetd/ext.h   Sat Mar 28 17:02:32 2020
(r359398)
+++ head/contrib/telnet/telnetd/ext.h   Sat Mar 28 17:06:34 2020
(r359399)
@@ -58,7 +58,7 @@ extern intauth_level;
 
 extern slcfun  slctab[NSLC + 1];   /* slc mapping table */
 
-char   *terminaltype;
+extern char*terminaltype;
 
 /*
  * I/O data buffers, pointers, and counters.
@@ -175,6 +175,10 @@ void   output_datalen(const char *, int);
 void   startslave(char *, int, char *);
 
 #ifdef ENCRYPTION
+/*
+ * These functions pointers point to the current routines
+ * for encrypting and decrypting data.
+ */
 extern void(*encrypt_output)(unsigned char *, int);
 extern int (*decrypt_input)(int);
 extern char*nclearto;

Modified: head/contrib/telnet/telnetd/sys_term.c
==
--- head/contrib/telnet/telnetd/sys_term.c  Sat Mar 28 17:02:32 2020
(r359398)
+++ head/contrib/telnet/telnetd/sys_term.c  Sat Mar 28 17:06:34 2020
(r359399)
@@ -376,8 +376,6 @@ spcset(int func, cc_t *valp, cc_t **valpp)
  *
  * Returns the file descriptor of the opened pty.
  */
-char line[32];
-
 int
 getpty(int *ptynum __unused)
 {

Modified: head/contrib/telnet/telnetd/telnetd.c
==
--- head/contrib/telnet/telnetd/telnetd.c   Sat Mar 28 17:02:32 2020
(r359398)
+++ head/contrib/telnet/telnetd/telnetd.c   Sat Mar 28 17:06:34 2020
(r359399)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 
 #ifdef AUTHENTICATION
 #include 
-intauth_level = 0;
 #endif
 #ifdef ENCRYPTION
 #include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359397 - in head/cddl/contrib/opensolaris/cmd: zfs zpool

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:00:38 2020
New Revision: 359397
URL: https://svnweb.freebsd.org/changeset/base/359397

Log:
  zfs: fix -fno-common issues
  
  A similar (or identical?) fix has already landed in OpenZFS.
  
  -fno-common will become the default in GCC10/LLVM11.
  
  MFC after:3 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.hSat Mar 28 16:26:47 
2020(r359396)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_util.hSat Mar 28 17:00:38 
2020(r359397)
@@ -33,7 +33,7 @@ extern "C" {
 
 void * safe_malloc(size_t size);
 void nomem(void);
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;
 
 #ifdef __cplusplus
 }

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cSat Mar 28 
16:26:47 2020(r359396)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cSat Mar 28 
17:00:38 2020(r359397)
@@ -64,6 +64,8 @@
 
 #include "statcommon.h"
 
+libzfs_handle_t *g_zfs;
+
 static int zpool_do_create(int, char **);
 static int zpool_do_destroy(int, char **);
 

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
==
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.hSat Mar 28 
16:26:47 2020(r359396)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_util.hSat Mar 28 
17:00:38 2020(r359397)
@@ -64,7 +64,7 @@ void pool_list_free(zpool_list_t *);
 int pool_list_count(zpool_list_t *);
 void pool_list_remove(zpool_list_t *, zpool_handle_t *);
 
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;
 
 #ifdef __cplusplus
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359400 - stable/11/stand/lua

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:11:54 2020
New Revision: 359400
URL: https://svnweb.freebsd.org/changeset/base/359400

Log:
  MFC r359072-r359073: loader: Add a "kernel.loaded" hook
  
  This hook can be useful, for example to run a local function to choose
  different modules to load when a user has picked a different kernel
  from the menu.

Modified:
  stable/11/stand/lua/config.lua
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/lua/config.lua
==
--- stable/11/stand/lua/config.lua  Sat Mar 28 17:06:34 2020
(r359399)
+++ stable/11/stand/lua/config.lua  Sat Mar 28 17:11:54 2020
(r359400)
@@ -623,7 +623,7 @@ end
 function config.loadelf()
local xen_kernel = loader.getenv('xen_kernel')
local kernel = config.kernel_selected or config.kernel_loaded
-   local loaded, status
+   local status
 
if xen_kernel ~= nil then
print(MSG_XENKERNLOADING)
@@ -633,11 +633,10 @@ function config.loadelf()
end
end
print(MSG_KERNLOADING)
-   loaded = config.loadKernel(kernel)
-
-   if not loaded then
+   if not config.loadKernel(kernel) then
return false
end
+   hook.runAll("kernel.loaded")
 
print(MSG_MODLOADING)
status = loadModule(modules, not config.verbose)
@@ -647,5 +646,6 @@ end
 
 hook.registerType("config.loaded")
 hook.registerType("config.reloaded")
+hook.registerType("kernel.loaded")
 hook.registerType("modules.loaded")
 return config
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359398 - head/bin/sh

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:02:32 2020
New Revision: 359398
URL: https://svnweb.freebsd.org/changeset/base/359398

Log:
  sh: remove duplicate el definition
  
  el is declared extern in myhistedit.h and defined in histedit.c. Remove the
  duplicate definition in input.c to appease the -fno-common build.
  
  -fno-common will become the default in GCC10/LLVM11.
  
  MFC after:3 days

Modified:
  head/bin/sh/input.c

Modified: head/bin/sh/input.c
==
--- head/bin/sh/input.c Sat Mar 28 17:00:38 2020(r359397)
+++ head/bin/sh/input.c Sat Mar 28 17:02:32 2020(r359398)
@@ -102,8 +102,6 @@ static struct parsefile basepf = {  /* top level input 
 static struct parsefile *parsefile = &basepf;  /* current input file */
 int whichprompt;   /* 1 == PS1, 2 == PS2 */
 
-EditLine *el;  /* cookie for editline package */
-
 static void pushfile(void);
 static int preadfd(void);
 static void popstring(void);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359394 - head/contrib/tcsh

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 15:00:55 2020
New Revision: 359394
URL: https://svnweb.freebsd.org/changeset/base/359394

Log:
  MFV r359393: tcsh: import 6974bc35a5cd
  
  This removes an extra variable definition that causes the -fno-common build
  to fail, which will be a new default in GCC10/LLVM11.
  
  MFC after:3 days

Modified:
  head/contrib/tcsh/tc.sig.c
Directory Properties:
  head/contrib/tcsh/   (props changed)

Modified: head/contrib/tcsh/tc.sig.c
==
--- head/contrib/tcsh/tc.sig.c  Sat Mar 28 14:58:03 2020(r359393)
+++ head/contrib/tcsh/tc.sig.c  Sat Mar 28 15:00:55 2020(r359394)
@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
 int phup_disabled; /* = 0; */
 int pchild_disabled; /* = 0; */
 int pintr_disabled; /* = 0; */
-int handle_interrupt; /* = 0; */
 
 int
 handle_pending_signals(void)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359402 - head/contrib/openbsm/bin/auditreduce

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:36:39 2020
New Revision: 359402
URL: https://svnweb.freebsd.org/changeset/base/359402

Log:
  MFV r359401: OpenBSM: import ee79d73e8df5: auditreduce: add a zone filter
  
  This allows one to select audit records that match a -z zone glob.
  
  MFC after:1 week
  Sponsored by: Modirum MDPay, Klara Systems

Modified:
  head/contrib/openbsm/bin/auditreduce/auditreduce.1
  head/contrib/openbsm/bin/auditreduce/auditreduce.c
  head/contrib/openbsm/bin/auditreduce/auditreduce.h
Directory Properties:
  head/contrib/openbsm/   (props changed)

Modified: head/contrib/openbsm/bin/auditreduce/auditreduce.1
==
--- head/contrib/openbsm/bin/auditreduce/auditreduce.1  Sat Mar 28 17:34:47 
2020(r359401)
+++ head/contrib/openbsm/bin/auditreduce/auditreduce.1  Sat Mar 28 17:36:39 
2020(r359402)
@@ -25,7 +25,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 24, 2004
+.Dd February 20, 2020
 .Dt AUDITREDUCE 1
 .Os
 .Sh NAME
@@ -47,6 +47,7 @@
 .Op Fl r Ar ruid
 .Op Fl u Ar auid
 .Op Fl v
+.Op Fl z Ar zone
 .Op Ar
 .Sh DESCRIPTION
 The
@@ -129,6 +130,10 @@ Select records with the given real user ID or name.
 Select records with the given audit ID.
 .It Fl v
 Invert sense of matching, to select records that do not match.
+.It Fl z Ar zone
+Select records from the given zone(s).
+.Ar zone
+is a glob for zones to match.
 .El
 .Sh EXAMPLES
 To select all records associated with effective user ID root from the audit

Modified: head/contrib/openbsm/bin/auditreduce/auditreduce.c
==
--- head/contrib/openbsm/bin/auditreduce/auditreduce.c  Sat Mar 28 17:34:47 
2020(r359401)
+++ head/contrib/openbsm/bin/auditreduce/auditreduce.c  Sat Mar 28 17:36:39 
2020(r359402)
@@ -62,6 +62,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +95,7 @@ static int p_egid;/* Effective group id. 
*/ 
 static int  p_rgid;/* Real group id. */ 
 static int  p_ruid;/* Real user id. */ 
 static int  p_subid;   /* Subject id. */
+static const char  *p_zone;/* Zone. */
 
 /*
  * Maintain a dynamically sized array of events for -m
@@ -114,6 +116,8 @@ static char *p_sockobj = NULL; 
 
 static uint32_t opttochk = 0;
 
+static int select_zone(const char *zone, uint32_t *optchkd);
+
 static void
 parse_regexp(char *re_string)
 {
@@ -186,6 +190,7 @@ usage(const char *msg)
fprintf(stderr, "\t-r  : real user\n");
fprintf(stderr, "\t-u  : audit user\n");
fprintf(stderr, "\t-v : select non-matching records\n");
+   fprintf(stderr, "\t-z  : zone name\n");
exit(EX_USAGE);
 }
 
@@ -493,6 +498,21 @@ select_subj32(tokenstr_t tok, uint32_t *optchkd)
 }
 
 /*
+ * Check if the given zone matches the selection criteria.
+  */
+static int
+select_zone(const char *zone, uint32_t *optchkd)
+{
+
+   SETOPT((*optchkd), OPT_z);
+   if (ISOPTSET(opttochk, OPT_z) && p_zone != NULL) {
+   if (fnmatch(p_zone, zone, FNM_PATHNAME) != 0)
+   return (0);
+   }
+   return (1);
+}
+
+/*
  * Read each record from the audit trail.  Check if it is selected after
  * passing through each of the options 
  */
@@ -559,6 +579,10 @@ select_records(FILE *fp)
tok_hdr32_copy, &optchkd);
break;
 
+   case AUT_ZONENAME:
+   selected = 
select_zone(tok.tt.zonename.zonename, &optchkd);
+   break;
+
default:
break;
}
@@ -629,7 +653,7 @@ main(int argc, char **argv)
 
converr = NULL;
 
-   while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:v")) != -1) {
+   while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:vz:")) != -1) 
{
switch(ch) {
case 'A':
SETOPT(opttochk, OPT_A);
@@ -781,6 +805,11 @@ main(int argc, char **argv)
 
case 'v':
SETOPT(opttochk, OPT_v);
+   break;
+
+   case 'z':
+   p_zone = optarg;
+   SETOPT(opttochk, OPT_z);
break;
 
case '?':

Modified: head/contrib/openbsm/bin/auditreduce/auditreduce.h
==
--- head/contrib/openbsm/bin/auditreduce/auditreduce.h  Sat Mar 28 17:34:47 
2020(r359401)
+++ head/contrib/openbsm/bin/auditreduce/auditreduce.h  Sat Mar 28 17:36:39 
2020(r359402)
@@ -57,6 +57,7 @@ struct re_entry {
 #define OPT_u  0x0001
 #define OPT_A  0x00020

svn commit: r359401 - vendor/openbsm/dist/bin/auditreduce

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:34:47 2020
New Revision: 359401
URL: https://svnweb.freebsd.org/changeset/base/359401

Log:
  OpenBSM: import ee79d73e8df5: auditreduce: add a zone filter
  
  This allows one to select audit records that match a -z zone glob.
  
  Sponsored by: Modirum MDPay, Klara Systems

Modified:
  vendor/openbsm/dist/bin/auditreduce/auditreduce.1
  vendor/openbsm/dist/bin/auditreduce/auditreduce.c
  vendor/openbsm/dist/bin/auditreduce/auditreduce.h

Modified: vendor/openbsm/dist/bin/auditreduce/auditreduce.1
==
--- vendor/openbsm/dist/bin/auditreduce/auditreduce.1   Sat Mar 28 17:11:54 
2020(r359400)
+++ vendor/openbsm/dist/bin/auditreduce/auditreduce.1   Sat Mar 28 17:34:47 
2020(r359401)
@@ -25,7 +25,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 24, 2004
+.Dd February 20, 2020
 .Dt AUDITREDUCE 1
 .Os
 .Sh NAME
@@ -47,6 +47,7 @@
 .Op Fl r Ar ruid
 .Op Fl u Ar auid
 .Op Fl v
+.Op Fl z Ar zone
 .Op Ar
 .Sh DESCRIPTION
 The
@@ -129,6 +130,10 @@ Select records with the given real user ID or name.
 Select records with the given audit ID.
 .It Fl v
 Invert sense of matching, to select records that do not match.
+.It Fl z Ar zone
+Select records from the given zone(s).
+.Ar zone
+is a glob for zones to match.
 .El
 .Sh EXAMPLES
 To select all records associated with effective user ID root from the audit

Modified: vendor/openbsm/dist/bin/auditreduce/auditreduce.c
==
--- vendor/openbsm/dist/bin/auditreduce/auditreduce.c   Sat Mar 28 17:11:54 
2020(r359400)
+++ vendor/openbsm/dist/bin/auditreduce/auditreduce.c   Sat Mar 28 17:34:47 
2020(r359401)
@@ -62,6 +62,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +95,7 @@ static int p_egid;/* Effective group id. 
*/ 
 static int  p_rgid;/* Real group id. */ 
 static int  p_ruid;/* Real user id. */ 
 static int  p_subid;   /* Subject id. */
+static const char  *p_zone;/* Zone. */
 
 /*
  * Maintain a dynamically sized array of events for -m
@@ -114,6 +116,8 @@ static char *p_sockobj = NULL; 
 
 static uint32_t opttochk = 0;
 
+static int select_zone(const char *zone, uint32_t *optchkd);
+
 static void
 parse_regexp(char *re_string)
 {
@@ -186,6 +190,7 @@ usage(const char *msg)
fprintf(stderr, "\t-r  : real user\n");
fprintf(stderr, "\t-u  : audit user\n");
fprintf(stderr, "\t-v : select non-matching records\n");
+   fprintf(stderr, "\t-z  : zone name\n");
exit(EX_USAGE);
 }
 
@@ -493,6 +498,21 @@ select_subj32(tokenstr_t tok, uint32_t *optchkd)
 }
 
 /*
+ * Check if the given zone matches the selection criteria.
+  */
+static int
+select_zone(const char *zone, uint32_t *optchkd)
+{
+
+   SETOPT((*optchkd), OPT_z);
+   if (ISOPTSET(opttochk, OPT_z) && p_zone != NULL) {
+   if (fnmatch(p_zone, zone, FNM_PATHNAME) != 0)
+   return (0);
+   }
+   return (1);
+}
+
+/*
  * Read each record from the audit trail.  Check if it is selected after
  * passing through each of the options 
  */
@@ -559,6 +579,10 @@ select_records(FILE *fp)
tok_hdr32_copy, &optchkd);
break;
 
+   case AUT_ZONENAME:
+   selected = 
select_zone(tok.tt.zonename.zonename, &optchkd);
+   break;
+
default:
break;
}
@@ -629,7 +653,7 @@ main(int argc, char **argv)
 
converr = NULL;
 
-   while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:v")) != -1) {
+   while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:vz:")) != -1) 
{
switch(ch) {
case 'A':
SETOPT(opttochk, OPT_A);
@@ -781,6 +805,11 @@ main(int argc, char **argv)
 
case 'v':
SETOPT(opttochk, OPT_v);
+   break;
+
+   case 'z':
+   p_zone = optarg;
+   SETOPT(opttochk, OPT_z);
break;
 
case '?':

Modified: vendor/openbsm/dist/bin/auditreduce/auditreduce.h
==
--- vendor/openbsm/dist/bin/auditreduce/auditreduce.h   Sat Mar 28 17:11:54 
2020(r359400)
+++ vendor/openbsm/dist/bin/auditreduce/auditreduce.h   Sat Mar 28 17:34:47 
2020(r359401)
@@ -57,6 +57,7 @@ struct re_entry {
 #define OPT_u  0x0001
 #define OPT_A  0x0002
 #define OPT_v  0x0004
+#define OPT_z  0x0008
 
 #define FILEOBJ "file"
 #define MSGQIDOBJ "ms

svn commit: r359403 - in head/contrib/telnet: libtelnet telnetd

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 17:57:36 2020
New Revision: 359403
URL: https://svnweb.freebsd.org/changeset/base/359403

Log:
  Revert 359399: telnet -fno-common bits
  
  There was a large misfire from my local diff that I need to investigate, and
  this version committed did not build.

Modified:
  head/contrib/telnet/libtelnet/encrypt.c
  head/contrib/telnet/telnetd/ext.h
  head/contrib/telnet/telnetd/sys_term.c
  head/contrib/telnet/telnetd/telnetd.c

Modified: head/contrib/telnet/libtelnet/encrypt.c
==
--- head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:36:39 2020
(r359402)
+++ head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:57:36 2020
(r359403)
@@ -69,6 +69,13 @@ static const char sccsid[] = "@(#)encrypt.c  8.2 (Berke
 #include "encrypt.h"
 #include "misc.h"
 
+/*
+ * These functions pointers point to the current routines
+ * for encrypting and decrypting data.
+ */
+void   (*encrypt_output)(unsigned char *, int);
+int(*decrypt_input)(int);
+
 int EncryptType(char *type, char *mode);
 int EncryptStart(char *mode);
 int EncryptStop(char *mode);

Modified: head/contrib/telnet/telnetd/ext.h
==
--- head/contrib/telnet/telnetd/ext.h   Sat Mar 28 17:36:39 2020
(r359402)
+++ head/contrib/telnet/telnetd/ext.h   Sat Mar 28 17:57:36 2020
(r359403)
@@ -58,7 +58,7 @@ extern intauth_level;
 
 extern slcfun  slctab[NSLC + 1];   /* slc mapping table */
 
-extern char*terminaltype;
+char   *terminaltype;
 
 /*
  * I/O data buffers, pointers, and counters.
@@ -175,10 +175,6 @@ void   output_datalen(const char *, int);
 void   startslave(char *, int, char *);
 
 #ifdef ENCRYPTION
-/*
- * These functions pointers point to the current routines
- * for encrypting and decrypting data.
- */
 extern void(*encrypt_output)(unsigned char *, int);
 extern int (*decrypt_input)(int);
 extern char*nclearto;

Modified: head/contrib/telnet/telnetd/sys_term.c
==
--- head/contrib/telnet/telnetd/sys_term.c  Sat Mar 28 17:36:39 2020
(r359402)
+++ head/contrib/telnet/telnetd/sys_term.c  Sat Mar 28 17:57:36 2020
(r359403)
@@ -376,6 +376,8 @@ spcset(int func, cc_t *valp, cc_t **valpp)
  *
  * Returns the file descriptor of the opened pty.
  */
+char line[32];
+
 int
 getpty(int *ptynum __unused)
 {

Modified: head/contrib/telnet/telnetd/telnetd.c
==
--- head/contrib/telnet/telnetd/telnetd.c   Sat Mar 28 17:36:39 2020
(r359402)
+++ head/contrib/telnet/telnetd/telnetd.c   Sat Mar 28 17:57:36 2020
(r359403)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef AUTHENTICATION
 #include 
+intauth_level = 0;
 #endif
 #ifdef ENCRYPTION
 #include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359404 - head/contrib/telnet/telnetd

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 19:43:45 2020
New Revision: 359404
URL: https://svnweb.freebsd.org/changeset/base/359404

Log:
  Re-apply r359399: telnet -fno-common fix
  
  line and auth_level's redefinitions are just extraneous
  
  telnetd will #define extern and then include ext.h to allocate storage for
  all of these extern'd vars; however, two of them are actually defined in
  libtelnet instead. Instead of doing an #ifdef extern dance around those
  function pointers, just add an EXTERN macro to make it easier to
  differentiate by sight which ones will get allocated in globals.c and which
  ones are defined elsewhere.
  
  MFC after:3 days

Modified:
  head/contrib/telnet/telnetd/ext.h
  head/contrib/telnet/telnetd/global.c
  head/contrib/telnet/telnetd/state.c
  head/contrib/telnet/telnetd/sys_term.c
  head/contrib/telnet/telnetd/telnetd.c

Modified: head/contrib/telnet/telnetd/ext.h
==
--- head/contrib/telnet/telnetd/ext.h   Sat Mar 28 17:57:36 2020
(r359403)
+++ head/contrib/telnet/telnetd/ext.h   Sat Mar 28 19:43:45 2020
(r359404)
@@ -30,53 +30,57 @@
  * $FreeBSD$
  */
 
+#ifndef EXTERN
+#defineEXTERN  extern
+#endif
+
 /*
  * Telnet server variable declarations
  */
-extern charoptions[256];
-extern chardo_dont_resp[256];
-extern charwill_wont_resp[256];
-extern int linemode;   /* linemode on/off */
+EXTERN charoptions[256];
+EXTERN chardo_dont_resp[256];
+EXTERN charwill_wont_resp[256];
+EXTERN int linemode;   /* linemode on/off */
 #ifdef LINEMODE
-extern int uselinemode;/* what linemode to use (on/off) */
-extern int editmode;   /* edit modes in use */
-extern int useeditmode;/* edit modes to use */
-extern int alwayslinemode; /* command line option */
-extern int lmodetype;  /* Client support for linemode */
+EXTERN int uselinemode;/* what linemode to use (on/off) */
+EXTERN int editmode;   /* edit modes in use */
+EXTERN int useeditmode;/* edit modes to use */
+EXTERN int alwayslinemode; /* command line option */
+EXTERN int lmodetype;  /* Client support for linemode */
 #endif /* LINEMODE */
-extern int flowmode;   /* current flow control state */
-extern int restartany; /* restart output on any character state */
+EXTERN int flowmode;   /* current flow control state */
+EXTERN int restartany; /* restart output on any character state */
 #ifdef DIAGNOSTICS
-extern int diagnostic; /* telnet diagnostic capabilities */
+EXTERN int diagnostic; /* telnet diagnostic capabilities */
 #endif /* DIAGNOSTICS */
 #ifdef BFTPDAEMON
-extern int bftpd;  /* behave as bftp daemon */
+EXTERN int bftpd;  /* behave as bftp daemon */
 #endif /* BFTPDAEMON */
 #ifdef AUTHENTICATION
-extern int auth_level;
+EXTERN int auth_level;
 #endif
 
-extern slcfun  slctab[NSLC + 1];   /* slc mapping table */
+EXTERN slcfun  slctab[NSLC + 1];   /* slc mapping table */
 
-char   *terminaltype;
+EXTERN char*terminaltype;
 
 /*
  * I/O data buffers, pointers, and counters.
  */
-extern charptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
+EXTERN charptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
 
-extern charnetibuf[BUFSIZ], *netip;
+EXTERN charnetibuf[BUFSIZ], *netip;
 
-extern charnetobuf[BUFSIZ], *nfrontp, *nbackp;
-extern char*neturg;/* one past last bye of urgent data */
+EXTERN charnetobuf[BUFSIZ], *nfrontp, *nbackp;
+EXTERN char*neturg;/* one past last bye of urgent data */
 
-extern int pcc, ncc;
+EXTERN int pcc, ncc;
 
-extern int pty, net;
-extern charline[32];
-extern int SYNCHing;   /* we are in TELNET SYNCH mode */
+EXTERN int pty, net;
+EXTERN charline[32];
+EXTERN int SYNCHing;   /* we are in TELNET SYNCH mode */
 
-extern void
+EXTERN void
_termstat(void),
add_slc(char, char, cc_t),
check_slc(void),
@@ -133,7 +137,7 @@ extern void
tty_binaryin(int),
tty_binaryout(int);
 
-extern int
+EXTERN int
end_slc(unsigned char **),
getnpty(void),
 #ifndef convex
@@ -158,7 +162,7 @@ extern int
tty_istrapsig(void),
tty_linemode(void);
 
-extern void
+EXTERN void
tty_rspeed(int),
tty_setecho(int),
tty_setedit(int),
@@ -177,7 +181,7 @@ voidstartslave(char *, int, char *);
 #ifdef ENCRYPTION
 extern void(*encrypt_output)(unsigned char *, int);
 extern int (*decrypt_input)(int);
-extern char*nclearto;
+EXTERN char*nclearto;
 #endif /* ENCRYPTION */
 
 
@@ -186,7 +190,7 @@ extern char *nclearto;
  * the relationship between various variables.
  */
 
-extern struct {
+EXTERN struct {
 int
system, /* what the current time is */
echotoggle, /* last 

svn commit: r359406 - head/contrib/telnet/telnetd

[Kyle Evans]

Author: kevans
Date: Sat Mar 28 20:43:15 2020
New Revision: 359406
URL: https://svnweb.freebsd.org/changeset/base/359406

Log:
  telnet: kill off remaining duplicate definition

Modified:
  head/contrib/telnet/telnetd/state.c

Modified: head/contrib/telnet/telnetd/state.c
==
--- head/contrib/telnet/telnetd/state.c Sat Mar 28 20:25:45 2020
(r359405)
+++ head/contrib/telnet/telnetd/state.c Sat Mar 28 20:43:15 2020
(r359406)
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #endif
 
-char   *terminaltype;
-
 unsigned char  doopt[] = { IAC, DO, '%', 'c', 0 };
 unsigned char  dont[] = { IAC, DONT, '%', 'c', 0 };
 unsigned char  will[] = { IAC, WILL, '%', 'c', 0 };
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359405 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Mar 28 20:25:45 2020
New Revision: 359405
URL: https://svnweb.freebsd.org/changeset/base/359405

Log:
  Handle integer overflows correctly when converting msecs and secs to
  ticks and vice versa.
  These issues were caught by recently added panic() calls on INVARIANTS
  systems.
  
  Reported by:  syzbot+b44787b4be7096cd1...@syzkaller.appspotmail.com
  Reported by:  syzbot+35f82d22805c1e899...@syzkaller.appspotmail.com
  MFC after:1 week

Modified:
  head/sys/netinet/sctp_cc_functions.c
  head/sys/netinet/sctp_constants.h
  head/sys/netinet/sctp_input.c
  head/sys/netinet/sctp_pcb.c
  head/sys/netinet/sctp_timer.c
  head/sys/netinet/sctp_usrreq.c
  head/sys/netinet/sctputil.c
  head/sys/netinet/sctputil.h

Modified: head/sys/netinet/sctp_cc_functions.c
==
--- head/sys/netinet/sctp_cc_functions.cSat Mar 28 19:43:45 2020
(r359404)
+++ head/sys/netinet/sctp_cc_functions.cSat Mar 28 20:25:45 2020
(r359405)
@@ -1914,7 +1914,7 @@ measure_rtt(struct sctp_nets *net)
if (net->fast_retran_ip == 0 && net->ssthresh < 0x && 
htcp_ccount(&net->cc_mod.htcp_ca) > 3) {
if (net->cc_mod.htcp_ca.maxRTT < net->cc_mod.htcp_ca.minRTT)
net->cc_mod.htcp_ca.maxRTT = net->cc_mod.htcp_ca.minRTT;
-   if (net->cc_mod.htcp_ca.maxRTT < srtt && srtt <= 
net->cc_mod.htcp_ca.maxRTT + MSEC_TO_TICKS(20))
+   if (net->cc_mod.htcp_ca.maxRTT < srtt && srtt <= 
net->cc_mod.htcp_ca.maxRTT + sctp_msecs_to_ticks(20))
net->cc_mod.htcp_ca.maxRTT = srtt;
}
 }
@@ -1975,7 +1975,7 @@ htcp_beta_update(struct htcp *ca, uint32_t minRTT, uin
}
}
 
-   if (ca->modeswitch && minRTT > (uint32_t)MSEC_TO_TICKS(10) && maxRTT) {
+   if (ca->modeswitch && minRTT > sctp_msecs_to_ticks(10) && maxRTT) {
ca->beta = (minRTT << 7) / maxRTT;
if (ca->beta < BETA_MIN)
ca->beta = BETA_MIN;

Modified: head/sys/netinet/sctp_constants.h
==
--- head/sys/netinet/sctp_constants.h   Sat Mar 28 19:43:45 2020
(r359404)
+++ head/sys/netinet/sctp_constants.h   Sat Mar 28 20:25:45 2020
(r359405)
@@ -577,16 +577,6 @@ __FBSDID("$FreeBSD$");
 #define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512
 
 
-/* The conversion from time to ticks and vice versa is done by rounding
- * upwards. This way we can test in the code the time to be positive and
- * know that this corresponds to a positive number of ticks.
- */
-#define MSEC_TO_TICKS(x) ((hz == 1000) ? x : x) * hz) + 999) / 1000))
-#define TICKS_TO_MSEC(x) ((hz == 1000) ? x : x) * 1000) + (hz - 1)) / hz))
-
-#define SEC_TO_TICKS(x) ((x) * hz)
-#define TICKS_TO_SEC(x) (((x) + (hz - 1)) / hz)
-
 /*
  * Basically the minimum amount of time before I do a early FR. Making this
  * value to low will cause duplicate retransmissions.

Modified: head/sys/netinet/sctp_input.c
==
--- head/sys/netinet/sctp_input.c   Sat Mar 28 19:43:45 2020
(r359404)
+++ head/sys/netinet/sctp_input.c   Sat Mar 28 20:25:45 2020
(r359405)
@@ -2600,7 +2600,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, in
 */
(void)SCTP_GETTIME_TIMEVAL(&now);
/* Expire time is in Ticks, so we convert to seconds */
-   time_expires.tv_sec = cookie->time_entered.tv_sec + 
TICKS_TO_SEC(cookie->cookie_life);
+   time_expires.tv_sec = cookie->time_entered.tv_sec + 
sctp_ticks_to_secs(cookie->cookie_life);
time_expires.tv_usec = cookie->time_entered.tv_usec;
if (timevalcmp(&now, &time_expires, >)) {
/* cookie is stale! */

Modified: head/sys/netinet/sctp_pcb.c
==
--- head/sys/netinet/sctp_pcb.c Sat Mar 28 19:43:45 2020(r359404)
+++ head/sys/netinet/sctp_pcb.c Sat Mar 28 20:25:45 2020(r359405)
@@ -2556,13 +2556,13 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
m = &inp->sctp_ep;
 
/* setup the base timeout information */
-   m->sctp_timeoutticks[SCTP_TIMER_SEND] = SEC_TO_TICKS(SCTP_SEND_SEC);
/* needed ? */
-   m->sctp_timeoutticks[SCTP_TIMER_INIT] = SEC_TO_TICKS(SCTP_INIT_SEC);
/* needed ? */
-   m->sctp_timeoutticks[SCTP_TIMER_RECV] = 
MSEC_TO_TICKS(SCTP_BASE_SYSCTL(sctp_delayed_sack_time_default));
-   m->sctp_timeoutticks[SCTP_TIMER_HEARTBEAT] = 
MSEC_TO_TICKS(SCTP_BASE_SYSCTL(sctp_heartbeat_interval_default));
-   m->sctp_timeoutticks[SCTP_TIMER_PMTU] = 
SEC_TO_TICKS(SCTP_BASE_SYSCTL(sctp_pmtu_raise_time_default));
-   m->sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN] = 
SEC_TO_TICKS(SCTP_BASE_SYSCTL(sctp_shutdown_guard_time_default));
-   

svn commit: r359407 - head/stand/libsa

[Toomas Soome]

Author: tsoome
Date: Sat Mar 28 21:47:44 2020
New Revision: 359407
URL: https://svnweb.freebsd.org/changeset/base/359407

Log:
  loader: add knob to build with user malloc
  
  This option is intended to aid development, to allow building with user 
malloc.
  The use case would be to build userboot & test with libc (or other) malloc and
  use extra malloc debug features.

Modified:
  head/stand/libsa/stand.h

Modified: head/stand/libsa/stand.h
==
--- head/stand/libsa/stand.hSat Mar 28 20:43:15 2020(r359406)
+++ head/stand/libsa/stand.hSat Mar 28 21:47:44 2020(r359407)
@@ -436,7 +436,14 @@ extern voidmallocstats(void);
 
 const char *x86_hypervisor(void);
 
-#ifdef DEBUG_MALLOC
+#ifdef USER_MALLOC
+extern void *malloc(size_t);
+extern void *memalign(size_t, size_t);
+extern void *calloc(size_t, size_t);
+extern void free(void *);
+extern void *realloc(void *, size_t);
+extern void *reallocf(void *, size_t);
+#elif DEBUG_MALLOC
 #define malloc(x)  Malloc(x, __FILE__, __LINE__)
 #define memalign(x, y) Memalign(x, y, __FILE__, __LINE__)
 #define calloc(x, y)   Calloc(x, y, __FILE__, __LINE__)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359408 - head/stand/libsa/zfs

[Toomas Soome]

Author: tsoome
Date: Sat Mar 28 21:50:27 2020
New Revision: 359408
URL: https://svnweb.freebsd.org/changeset/base/359408

Log:
  loader: strdup name strings from dataset walker
  
  The removal of zfs scratch buffer did miss the fact the dataset
  lookup was picking up the names from zap list.

Modified:
  head/stand/libsa/zfs/zfs.c

Modified: head/stand/libsa/zfs/zfs.c
==
--- head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:47:44 2020(r359407)
+++ head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:50:27 2020(r359408)
@@ -92,7 +92,7 @@ static intzfs_env_count;
 SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head = 
SLIST_HEAD_INITIALIZER(zfs_be_head);
 struct zfs_be_list *zfs_be_headp;
 struct zfs_be_entry {
-   const char *name;
+   cha *name;
SLIST_ENTRY(zfs_be_entry) entries;
 } *zfs_be, *zfs_be_tmp;
 
@@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name)
while (!SLIST_EMPTY(&zfs_be_head)) {
zfs_be = SLIST_FIRST(&zfs_be_head);
SLIST_REMOVE_HEAD(&zfs_be_head, entries);
+   free(zfs_be->name);
free(zfs_be);
}
 
@@ -973,6 +974,7 @@ zfs_bootenv(const char *name)
while (!SLIST_EMPTY(&zfs_be_head)) {
zfs_be = SLIST_FIRST(&zfs_be_head);
SLIST_REMOVE_HEAD(&zfs_be_head, entries);
+   free(zfs_be->name);
free(zfs_be);
}
 
@@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value __unus
if (zfs_be == NULL) {
return (ENOMEM);
}
-   zfs_be->name = name;
+   zfs_be->name = strdup(name);
+   if (zfs_be->name == NULL) {
+   free(zfs_be);
+   return (ENOMEM);
+   }
SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries);
zfs_env_count++;
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359409 - head/stand/libsa/zfs

[Toomas Soome]

Author: tsoome
Date: Sat Mar 28 21:55:42 2020
New Revision: 359409
URL: https://svnweb.freebsd.org/changeset/base/359409

Log:
  loader: typo did slip into 359408
  
  somehow r was lost from 'char'.

Modified:
  head/stand/libsa/zfs/zfs.c

Modified: head/stand/libsa/zfs/zfs.c
==
--- head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:50:27 2020(r359408)
+++ head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:55:42 2020(r359409)
@@ -92,7 +92,7 @@ static intzfs_env_count;
 SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head = 
SLIST_HEAD_INITIALIZER(zfs_be_head);
 struct zfs_be_list *zfs_be_headp;
 struct zfs_be_entry {
-   cha *name;
+   char *name;
SLIST_ENTRY(zfs_be_entry) entries;
 } *zfs_be, *zfs_be_tmp;
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359408 - head/stand/libsa/zfs

[Oliver Pinter]

On Saturday, March 28, 2020, Toomas Soome  wrote:

> Author: tsoome
> Date: Sat Mar 28 21:50:27 2020
> New Revision: 359408
> URL: https://svnweb.freebsd.org/changeset/base/359408
>
> Log:
>   loader: strdup name strings from dataset walker
>
>   The removal of zfs scratch buffer did miss the fact the dataset
>   lookup was picking up the names from zap list.
>
> Modified:
>   head/stand/libsa/zfs/zfs.c
>
> Modified: head/stand/libsa/zfs/zfs.c
> 
> ==
> --- head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:47:44 2020(r359407)
> +++ head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:50:27 2020(r359408)
> @@ -92,7 +92,7 @@ static intzfs_env_count;
>  SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head =
> SLIST_HEAD_INITIALIZER(zfs_be_head);
>  struct zfs_be_list *zfs_be_headp;
>  struct zfs_be_entry {
> -   const char *name;
> +   cha *name;


I think this will be "char *".


> SLIST_ENTRY(zfs_be_entry) entries;
>  } *zfs_be, *zfs_be_tmp;
>
> @@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> +   free(zfs_be->name);
> free(zfs_be);
> }
>
> @@ -973,6 +974,7 @@ zfs_bootenv(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> +   free(zfs_be->name);
> free(zfs_be);
> }
>
> @@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value __unus
> if (zfs_be == NULL) {
> return (ENOMEM);
> }
> -   zfs_be->name = name;
> +   zfs_be->name = strdup(name);
> +   if (zfs_be->name == NULL) {
> +   free(zfs_be);
> +   return (ENOMEM);
> +   }
> SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries);
> zfs_env_count++;
>
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359408 - head/stand/libsa/zfs

[Toomas Soome via svn-src-all]

> On 29. Mar 2020, at 00:04, Oliver Pinter  wrote:
> 
> 
> 
> On Saturday, March 28, 2020, Toomas Soome  > wrote:
> Author: tsoome
> Date: Sat Mar 28 21:50:27 2020
> New Revision: 359408
> URL: https://svnweb.freebsd.org/changeset/base/359408 
> 
> 
> Log:
>   loader: strdup name strings from dataset walker
> 
>   The removal of zfs scratch buffer did miss the fact the dataset
>   lookup was picking up the names from zap list.
> 
> Modified:
>   head/stand/libsa/zfs/zfs.c
> 
> Modified: head/stand/libsa/zfs/zfs.c
> ==
> --- head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:47:44 2020(r359407)
> +++ head/stand/libsa/zfs/zfs.c  Sat Mar 28 21:50:27 2020(r359408)
> @@ -92,7 +92,7 @@ static intzfs_env_count;
>  SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head = 
> SLIST_HEAD_INITIALIZER(zfs_be_head);
>  struct zfs_be_list *zfs_be_headp;
>  struct zfs_be_entry {
> -   const char *name;
> +   cha *name;
> 
> I think this will be "char *". 


Yes, I guess I must have (accidentally) removed the ‘r' after the build. The 
fix is already posted.

rgds,
toomas

>  
> SLIST_ENTRY(zfs_be_entry) entries;
>  } *zfs_be, *zfs_be_tmp;
> 
> @@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> +   free(zfs_be->name);
> free(zfs_be);
> }
> 
> @@ -973,6 +974,7 @@ zfs_bootenv(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> +   free(zfs_be->name);
> free(zfs_be);
> }
> 
> @@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value __unus
> if (zfs_be == NULL) {
> return (ENOMEM);
> }
> -   zfs_be->name = name;
> +   zfs_be->name = strdup(name);
> +   if (zfs_be->name == NULL) {
> +   free(zfs_be);
> +   return (ENOMEM);
> +   }
> SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries);
> zfs_env_count++;
> 
> ___
> svn-src-h...@freebsd.org  mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head 
> 
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org 
> "

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359410 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Mar 28 22:35:04 2020
New Revision: 359410
URL: https://svnweb.freebsd.org/changeset/base/359410

Log:
  Small cleanup by using a variable just assigned.
  
  MFC after:1 week

Modified:
  head/sys/netinet/sctp_usrreq.c

Modified: head/sys/netinet/sctp_usrreq.c
==
--- head/sys/netinet/sctp_usrreq.c  Sat Mar 28 21:55:42 2020
(r359409)
+++ head/sys/netinet/sctp_usrreq.c  Sat Mar 28 22:35:04 2020
(r359410)
@@ -2658,8 +2658,8 @@ flags_out:
net = stcb->asoc.primary_destination;
if (net != NULL) {
memcpy(&sstat->sstat_primary.spinfo_address,
-   &stcb->asoc.primary_destination->ro._l_addr,
-   ((struct sockaddr 
*)(&stcb->asoc.primary_destination->ro._l_addr))->sa_len);
+   &net->ro._l_addr,
+   ((struct sockaddr 
*)(&net->ro._l_addr))->sa_len);
((struct sockaddr_in 
*)&sstat->sstat_primary.spinfo_address)->sin_port = stcb->rport;
/*
 * Again the user can get info from
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359411 - head/stand/efi/libefi

[Toomas Soome]

Author: tsoome
Date: Sat Mar 28 22:37:50 2020
New Revision: 359411
URL: https://svnweb.freebsd.org/changeset/base/359411

Log:
  loader.efi: restore the init and fix the color setup
  
  The efi console init is avoided since conin setup was moved to probe.
  In case the console is re-initialized, we need to pick up colors
  from environment.

Modified:
  head/stand/efi/libefi/efi_console.c

Modified: head/stand/efi/libefi/efi_console.c
==
--- head/stand/efi/libefi/efi_console.c Sat Mar 28 22:35:04 2020
(r359410)
+++ head/stand/efi/libefi/efi_console.c Sat Mar 28 22:37:50 2020
(r359411)
@@ -828,8 +828,9 @@ efi_cons_update_mode(void)
 {
UINTN cols, rows;
const teken_attr_t *a;
+   teken_attr_t attr;
EFI_STATUS status;
-   char env[8];
+   char env[8], *ptr;
 
status = conout->QueryMode(conout, conout->Mode->Mode, &cols, &rows);
if (EFI_ERROR(status) || cols * rows == 0) {
@@ -866,18 +867,35 @@ efi_cons_update_mode(void)
if (buffer != NULL) {
teken_set_winsize(&teken, &tp);
a = teken_get_defattr(&teken);
+   attr = *a;
 
-   snprintf(env, sizeof(env), "%d", a->ta_fgcolor);
-   env_setenv("teken.fg_color", EV_VOLATILE, env,
-   efi_set_colors, env_nounset);
-   snprintf(env, sizeof(env), "%d", a->ta_bgcolor);
-   env_setenv("teken.bg_color", EV_VOLATILE, env,
-   efi_set_colors, env_nounset);
+   /*
+* On first run, we set up the efi_set_colors()
+* callback. If the env is already set, we
+* pick up fg and bg color values from the environment.
+*/
+   ptr = getenv("teken.fg_color");
+   if (ptr != NULL) {
+   attr.ta_fgcolor = strtol(ptr, NULL, 10);
+   ptr = getenv("teken.bg_color");
+   attr.ta_bgcolor = strtol(ptr, NULL, 10);
 
+   teken_set_defattr(&teken, &attr);
+   } else {
+   snprintf(env, sizeof(env), "%d",
+   attr.ta_fgcolor);
+   env_setenv("teken.fg_color", EV_VOLATILE, env,
+   efi_set_colors, env_nounset);
+   snprintf(env, sizeof(env), "%d",
+   attr.ta_bgcolor);
+   env_setenv("teken.bg_color", EV_VOLATILE, env,
+   efi_set_colors, env_nounset);
+   }
+
for (int row = 0; row < rows; row++) {
for (int col = 0; col < cols; col++) {
buffer[col + row * tp.tp_col].c = ' ';
-   buffer[col + row * tp.tp_col].a = *a;
+   buffer[col + row * tp.tp_col].a = attr;
}
}
}
@@ -907,9 +925,6 @@ static int
 efi_cons_init(int arg)
 {
EFI_STATUS status;
-
-   if (conin != NULL)
-   return (0);
 
conout->EnableCursor(conout, TRUE);
if (efi_cons_update_mode())
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359407 - head/stand/libsa

[Warner Losh]

On Sat, Mar 28, 2020, 3:49 PM Toomas Soome  wrote:

> Author: tsoome
> Date: Sat Mar 28 21:47:44 2020
> New Revision: 359407
> URL: https://svnweb.freebsd.org/changeset/base/359407
>
> Log:
>   loader: add knob to build with user malloc
>
>   This option is intended to aid development, to allow building with user
> malloc.
>   The use case would be to build userboot & test with libc (or other)
> malloc and
>   use extra malloc debug features.
>
> Modified:
>   head/stand/libsa/stand.h
>
> Modified: head/stand/libsa/stand.h
>
> ==
> --- head/stand/libsa/stand.hSat Mar 28 20:43:15 2020(r359406)
> +++ head/stand/libsa/stand.hSat Mar 28 21:47:44 2020(r359407)
> @@ -436,7 +436,14 @@ extern voidmallocstats(void);
>
>  const char *x86_hypervisor(void);
>
> -#ifdef DEBUG_MALLOC
> +#ifdef USER_MALLOC
> +extern void *malloc(size_t);
> +extern void *memalign(size_t, size_t);
> +extern void *calloc(size_t, size_t);
> +extern void free(void *);
> +extern void *realloc(void *, size_t);
> +extern void *reallocf(void *, size_t);
> +#elif DEBUG_MALLOC
>

This is missing a defined().

Warner

>  #define malloc(x)  Malloc(x, __FILE__, __LINE__)
>  #define memalign(x, y) Memalign(x, y, __FILE__, __LINE__)
>  #define calloc(x, y)   Calloc(x, y, __FILE__, __LINE__)
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359412 - head/usr.bin/calendar/calendars

[Greg Lehey]

Author: grog
Date: Sat Mar 28 22:44:08 2020
New Revision: 359412
URL: https://svnweb.freebsd.org/changeset/base/359412

Log:
  Add year to Boganda's death.

Modified:
  head/usr.bin/calendar/calendars/calendar.holiday

Modified: head/usr.bin/calendar/calendars/calendar.holiday
==
--- head/usr.bin/calendar/calendars/calendar.holidaySat Mar 28 22:37:50 
2020(r359411)
+++ head/usr.bin/calendar/calendars/calendar.holidaySat Mar 28 22:44:08 
2020(r359412)
@@ -103,7 +103,7 @@
 03/26  Independence Day in Bangladesh
 03/26  Prince Jonah Kuhio Kalanianaole Day in Hawaii
 03/27  Armed Forces Day in Burma
-03/29  Death of President Barthelemy Boganda in Central African Republic
+03/29  Death of President Barthelemy Boganda in Central African Republic, 1959
 03/29  Memorial Day in Madagascar
 03/31  National Day in Malta
 03/MonLast Seward's Day in Alaska (last Monday)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359414 - head/sbin/iscontrol

[Kyle Evans]

Author: kevans
Date: Sun Mar 29 02:28:15 2020
New Revision: 359414
URL: https://svnweb.freebsd.org/changeset/base/359414

Log:
  iscontrol: move definition of vflag/iscsidev to iscontrol.c
  
  Mark the declaration extern as these are used elsewhere; this fixes the
  build with -fno-common.
  
  MFC after:3 days

Modified:
  head/sbin/iscontrol/iscontrol.c
  head/sbin/iscontrol/iscontrol.h

Modified: head/sbin/iscontrol/iscontrol.c
==
--- head/sbin/iscontrol/iscontrol.c Sun Mar 29 02:26:58 2020
(r359413)
+++ head/sbin/iscontrol/iscontrol.c Sun Mar 29 02:28:15 2020
(r359414)
@@ -82,6 +82,9 @@ token_t   DigestMethods[] = {
  {0, 0}
 };
 
+intvflag;
+char   *iscsidev;
+
 u_char isid[6 + 6];
 /*
  | Default values

Modified: head/sbin/iscontrol/iscontrol.h
==
--- head/sbin/iscontrol/iscontrol.h Sun Mar 29 02:26:58 2020
(r359413)
+++ head/sbin/iscontrol/iscontrol.h Sun Mar 29 02:28:15 2020
(r359414)
@@ -149,8 +149,8 @@ int recvpdu(isess_t *sess, pdu_t *pp);
 
 intlookup(token_t *tbl, char *m);
 
-intvflag;
-char   *iscsidev;
+extern int vflag;
+extern char*iscsidev;
 
 void   parseArgs(int nargs, char **args, isc_opt_t *op);
 void   parseConfig(FILE *fd, char *key, isc_opt_t *op);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359416 - head/usr.bin/systat

[Kyle Evans]

Author: kevans
Date: Sun Mar 29 02:30:23 2020
New Revision: 359416
URL: https://svnweb.freebsd.org/changeset/base/359416

Log:
  systat: remove redundant definition of kd
  
  kd is already properly declared in extern.h and defined in main.c, rendering
  this definition useless. This fixes the -fno-common build.
  
  MFC after:3 days

Modified:
  head/usr.bin/systat/swap.c

Modified: head/usr.bin/systat/swap.c
==
--- head/usr.bin/systat/swap.c  Sun Mar 29 02:29:06 2020(r359415)
+++ head/usr.bin/systat/swap.c  Sun Mar 29 02:30:23 2020(r359416)
@@ -58,8 +58,6 @@ static const char sccsid[] = "@(#)swap.c  8.3 (Berkeley
 #include "extern.h"
 #include "devs.h"
 
-kvm_t  *kd;
-
 static char *header;
 static long blocksize;
 static int dlen, odlen;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359413 - in head/contrib/ipfilter: . tools

[Kyle Evans]

Author: kevans
Date: Sun Mar 29 02:26:58 2020
New Revision: 359413
URL: https://svnweb.freebsd.org/changeset/base/359413

Log:
  ipfilter: remove duplicate definition of 'thishost'
  
  thishost is already defined in lib/initparse.c; no need for this one. This
  fixes the ipfilter build with -fno-common.
  
  -fno-common will become the default in GCC10/LLVM11.
  
  MFC after:3 days

Modified:
  head/contrib/ipfilter/ipf.h
  head/contrib/ipfilter/tools/ipnat.c

Modified: head/contrib/ipfilter/ipf.h
==
--- head/contrib/ipfilter/ipf.h Sat Mar 28 22:44:08 2020(r359412)
+++ head/contrib/ipfilter/ipf.h Sun Mar 29 02:26:58 2020(r359413)
@@ -191,7 +191,7 @@ typedef int (* addfunc_t) __P((int, ioctlfunc_t, 
void 
 typedefint (* copyfunc_t) __P((void *, void *, size_t));
 
 
-extern charthishost[];
+extern charthishost[MAXHOSTNAMELEN];
 extern charflagset[];
 extern u_char  flags[];
 extern struct ipopt_names ionames[];

Modified: head/contrib/ipfilter/tools/ipnat.c
==
--- head/contrib/ipfilter/tools/ipnat.c Sat Mar 28 22:44:08 2020
(r359412)
+++ head/contrib/ipfilter/tools/ipnat.c Sun Mar 29 02:26:58 2020
(r359413)
@@ -60,7 +60,6 @@ static const char rcsid[] = "@(#)$Id$";
 #definebzero(a,b)  memset(a,0,b)
 #endif
 intuse_inet6 = 0;
-char   thishost[MAXHOSTNAMELEN];
 
 extern char*optarg;
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359417 - in head: contrib/kyua/doc usr.bin/kyua

[Enji Cooper]

Author: ngie
Date: Sun Mar 29 02:40:03 2020
New Revision: 359417
URL: https://svnweb.freebsd.org/changeset/base/359417

Log:
  Revert r359385-r359387
  
  As noted by brooks/emaste, this is the wrong approach to take.
  Revert the changes so brooks can apply a more proper change.
  
  Requested by: brooks, emaste

Deleted:
  head/contrib/kyua/doc/kyua-about.1
  head/contrib/kyua/doc/kyua-config.1
  head/contrib/kyua/doc/kyua-db-exec.1
  head/contrib/kyua/doc/kyua-db-migrate.1
  head/contrib/kyua/doc/kyua-debug.1
  head/contrib/kyua/doc/kyua-help.1
  head/contrib/kyua/doc/kyua-list.1
  head/contrib/kyua/doc/kyua-report-html.1
  head/contrib/kyua/doc/kyua-report-junit.1
  head/contrib/kyua/doc/kyua-report.1
  head/contrib/kyua/doc/kyua-test.1
  head/contrib/kyua/doc/kyua.1
  head/contrib/kyua/doc/kyua.conf.5
  head/contrib/kyua/doc/kyuafile.5
Modified:
  head/usr.bin/kyua/Makefile

Modified: head/usr.bin/kyua/Makefile
==
--- head/usr.bin/kyua/Makefile  Sun Mar 29 02:30:23 2020(r359416)
+++ head/usr.bin/kyua/Makefile  Sun Mar 29 02:40:03 2020(r359417)
@@ -48,6 +48,20 @@ STORE=   migrate_v1_v2.sql migrate_v2_v3.sql 
schema_v3.
 STOREDIR=  ${KYUA_STOREDIR}
 .PATH: ${KYUA_SRCDIR}/store
 
+CLEANFILES+=   ${MAN}
 .PATH: ${KYUA_SRCDIR}/doc
+.for man in ${MAN}
+${man}: ${man}.in
+   ${SH} ${KYUA_SRCDIR}/doc/manbuild.sh \
+   -v "CONFDIR=${KYUA_CONFDIR}" \
+   -v "DOCDIR=${KYUA_DOCDIR}" \
+   -v "EGDIR=${KYUA_EGDIR}" \
+   -v "MISCDIR=${KYUA_MISCDIR}" \
+   -v "PACKAGE=kyua" \
+   -v "STOREDIR=${KYUA_STOREDIR}" \
+   -v "TESTSDIR=${TESTSBASE}" \
+   -v "VERSION=${KYUA_VERSION}" \
+   ${.ALLSRC} ${.TARGET}
+.endfor
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359385 - head/usr.bin/kyua

[Enji Cooper]

> On Mar 28, 2020, at 7:37 PM, Enji Cooper  wrote:
> 
>> 
>> On Mar 27, 2020, at 8:22 PM, Brooks Davis > > wrote:
>> 
>> On Sat, Mar 28, 2020 at 01:08:20AM +, Enji Cooper wrote:
>>> Author: ngie
>>> Date: Sat Mar 28 01:08:20 2020
>>> New Revision: 359385
>>> URL: https://svnweb.freebsd.org/changeset/base/359385 
>>> 
>>> 
>>> Log:
>>>  Check in the generated copies of the manpages
>>> 
>>>  These manpages were meant to be templated once per `configure` run.
>>> 
>>>  Given that we're not bound by as many constants, e.g., `--prefix` isn't
>>>  generally changing for kyua in the base system, having to generate the
>>>  manpages each build seems slightly less than optimal.
>>> 
>>>  In the event that one's build environment doesn't define `$SH`, the build
>>>  will also fail until this change is introduced.
>>> 
>>>  Instead of jumping through hoops dealing with shells or permissions, let's
>>>  just cut to the chase and check the generated copies into the sourcebase
>>>  under usr.bin/kyua .
>> 
>> This was the wrong fix.  Committing generated manpaged was
>> 100% the wrong solution and will make extra work in the
>> future.  The correct fix is almost certainly the one attached to
>> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245086 
>> .  If someone
>> doesn't beat me to it I will revert you wrong and broken commit along
>> with the followups and commit the correct one (this certainly won't be
>> until at least tomorrow).
> 
> I’ll revert my changes.

Done in r359417.
Thank you,
-Enji
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359415 - head/stand/userboot/userboot

[Kyle Evans]

Author: kevans
Date: Sun Mar 29 02:29:06 2020
New Revision: 359415
URL: https://svnweb.freebsd.org/changeset/base/359415

Log:
  userboot: mark host_fsops as extern
  
  This is already defined elsewhere; mark this declaration extern to the fix
  the -fno-common build.
  
  MFC after:3 days

Modified:
  head/stand/userboot/userboot/libuserboot.h

Modified: head/stand/userboot/userboot/libuserboot.h
==
--- head/stand/userboot/userboot/libuserboot.h  Sun Mar 29 02:28:15 2020
(r359414)
+++ head/stand/userboot/userboot/libuserboot.h  Sun Mar 29 02:29:06 2020
(r359415)
@@ -44,7 +44,7 @@ extern int userboot_disk_maxunit;
 extern struct devsw host_dev;
 
 /* access to host filesystem */
-struct fs_ops host_fsops;
+extern struct fs_ops host_fsops;
 
 struct bootinfo;
 struct preloaded_file;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359385 - head/usr.bin/kyua

[Enji Cooper]

> On Mar 27, 2020, at 8:22 PM, Brooks Davis  wrote:
> 
> On Sat, Mar 28, 2020 at 01:08:20AM +, Enji Cooper wrote:
>> Author: ngie
>> Date: Sat Mar 28 01:08:20 2020
>> New Revision: 359385
>> URL: https://svnweb.freebsd.org/changeset/base/359385
>> 
>> Log:
>>  Check in the generated copies of the manpages
>> 
>>  These manpages were meant to be templated once per `configure` run.
>> 
>>  Given that we're not bound by as many constants, e.g., `--prefix` isn't
>>  generally changing for kyua in the base system, having to generate the
>>  manpages each build seems slightly less than optimal.
>> 
>>  In the event that one's build environment doesn't define `$SH`, the build
>>  will also fail until this change is introduced.
>> 
>>  Instead of jumping through hoops dealing with shells or permissions, let's
>>  just cut to the chase and check the generated copies into the sourcebase
>>  under usr.bin/kyua .
> 
> This was the wrong fix.  Committing generated manpaged was
> 100% the wrong solution and will make extra work in the
> future.  The correct fix is almost certainly the one attached to
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245086 
> .  If someone
> doesn't beat me to it I will revert you wrong and broken commit along
> with the followups and commit the correct one (this certainly won't be
> until at least tomorrow).

I’ll revert my changes.
-Enji
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359418 - head/usr.bin/ncal

[Greg Lehey]

Author: grog
Date: Sun Mar 29 04:14:57 2020
New Revision: 359418
URL: https://svnweb.freebsd.org/changeset/base/359418

Log:
  Add STANDARDS section
  
  PR:   239723
  Submitted by: Gordon Bergling
  Reported by:  Gordon Bergling

Modified:
  head/usr.bin/ncal/ncal.1

Modified: head/usr.bin/ncal/ncal.1
==
--- head/usr.bin/ncal/ncal.1Sun Mar 29 02:40:03 2020(r359417)
+++ head/usr.bin/ncal/ncal.1Sun Mar 29 04:14:57 2020(r359418)
@@ -179,6 +179,24 @@ Highlighting of dates is disabled if stdout is not a t
 .Sh SEE ALSO
 .Xr calendar 3 ,
 .Xr strftime 3
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+X/Open System Interfaces option of the
+.St -p1003.1-2008
+specification.
+.Pp
+The flags
+.Op Fl 3hyJeopw ,
+as well as the ability to specify a month name as a single argument,
+are extensions to that specification.
+.Pp
+The week number computed by
+.Fl w
+is compliant with the
+.St -iso8601
+specification.
 .Sh HISTORY
 A
 .Nm
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359419 - head/usr.bin/ncal

[Greg Lehey]

Author: grog
Date: Sun Mar 29 04:18:27 2020
New Revision: 359419
URL: https://svnweb.freebsd.org/changeset/base/359419

Log:
  Remove spurious transition from Julian to Gregorian for country
  "Latin".
  
  Arguably the entire -p option should be removed.  It shows only a few
  countries, and it doesn't have any relationship with the rest of the
  program.
  
  PR:   244801
  Submitted by: grog@
  Reported by:  Hamid Ali

Modified:
  head/usr.bin/ncal/ncal.c

Modified: head/usr.bin/ncal/ncal.c
==
--- head/usr.bin/ncal/ncal.cSun Mar 29 04:14:57 2020(r359418)
+++ head/usr.bin/ncal/ncal.cSun Mar 29 04:18:27 2020(r359419)
@@ -95,7 +95,6 @@ static struct djswitch {
{"IT", "Italy", {1582, 10,  4}},
{"JP", "Japan", {1918, 12, 18}},
{"LI", "Lithuania", {1918,  2,  1}},
-   {"LN", "Latin", {, 05, 31}},
{"LU", "Luxembourg",{1582, 12, 14}},
{"LV", "Latvia",{1918,  2,  1}},
{"NL", "Netherlands",   {1582, 12, 14}},
@@ -580,7 +579,7 @@ printeaster(int y, int julian, int orthodox)
(y)++;  \
}
 #defineM2Y(m)  ((m) / 12)
-#defineM2M(m)  (1 + (m) % 12) 
+#defineM2M(m)  (1 + (m) % 12)
 
 /* Print all months for the period in the range [ before .. y-m .. after ]. */
 static void
@@ -925,7 +924,7 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines 
for (i = 0; i != 6; i++) {
l = 0;
for (j = firsts + 7 * i, k = 0; j < last && k != dw * 7;
-   j++, k += dw) { 
+   j++, k += dw) {
if (j >= first) {
if (jd_flag)
dt.d = j - jan1 + 1;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359420 - head/tests/sys/net/routing

[Alexander V. Chernikov]

Author: melifaro
Date: Sun Mar 29 06:25:57 2020
New Revision: 359420
URL: https://svnweb.freebsd.org/changeset/base/359420

Log:
  Switch rtsock tests to per-test jails and epair interfaces.
  
  Many rtsock tests verify the ordering of the kernel messages for the
   particular event. In order to avoid flaky tests due to the other tests
   running, switch all tests to use personal vnet-enabled jails.
  This removes all clashes on the IP addresses and brings back the ability
   to run these tests simultaneously.
  
  Reported by:  olivier
  Reviewed by:  olivier
  Differential Revision:https://reviews.freebsd.org/D24182

Added:
  head/tests/sys/net/routing/generic_cleanup.sh   (contents, props changed)
  head/tests/sys/net/routing/params.h   (contents, props changed)
Modified:
  head/tests/sys/net/routing/Makefile
  head/tests/sys/net/routing/rtsock_common.h
  head/tests/sys/net/routing/rtsock_config.h
  head/tests/sys/net/routing/test_rtsock_l3.c
  head/tests/sys/net/routing/test_rtsock_lladdr.c

Modified: head/tests/sys/net/routing/Makefile
==
--- head/tests/sys/net/routing/Makefile Sun Mar 29 04:18:27 2020
(r359419)
+++ head/tests/sys/net/routing/Makefile Sun Mar 29 06:25:57 2020
(r359420)
@@ -7,6 +7,9 @@ TESTSDIR=   ${TESTSBASE}/sys/net/routing
 ATF_TESTS_C += test_rtsock_l3
 ATF_TESTS_C += test_rtsock_lladdr
 
+${PACKAGE}FILES+=  generic_cleanup.sh
+${PACKAGE}FILESMODE_generic_cleanup.sh=0555
+
 # Most of the tests operates on a common IPv4/IPv6 prefix,
 # so running them in parallel will lead to weird results.
 TEST_METADATA+=is_exclusive=true

Added: head/tests/sys/net/routing/generic_cleanup.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tests/sys/net/routing/generic_cleanup.sh   Sun Mar 29 06:25:57 
2020(r359420)
@@ -0,0 +1,36 @@
+#!/bin/sh
+#-
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020 Alexander V. Chernikov
+#
+# 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$
+#
+
+
+srcdir=`dirname $0`
+. ${srcdir}/../../common/vnet.subr
+
+vnet_cleanup
+

Added: head/tests/sys/net/routing/params.h
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tests/sys/net/routing/params.h Sun Mar 29 06:25:57 2020
(r359420)
@@ -0,0 +1,38 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2019 Alexander V. Chernikov
+ *
+ * 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 LIABIL

Re: svn commit: r358989 - in head/stand/efi: libefi loader loader/arch/arm loader/arch/arm64

[Ruslan Garipov]

On 3/27/2020 8:07 PM, Toomas Soome wrote:
> 
> 
>> On 27. Mar 2020, at 16:39, Ruslan Garipov  wrote:
>>
>> On 3/14/2020 11:36 AM, Toomas Soome wrote:
>>> Author: tsoome
>>> Date: Sat Mar 14 06:36:03 2020
>>> New Revision: 358989
>>> URL: https://svnweb.freebsd.org/changeset/base/358989
>>>
>>> Log:
>>>  loader: add comconsole implementation on top of SIO protocol
>>>
>>>  Provide comconsole on top of SIO for arm platforms (x86 does use bios 
>>> version).
>>>
>>> Added:
>>>  head/stand/efi/loader/efiserialio.c   (contents, props changed)
>>> Modified:
>>>  head/stand/efi/libefi/efi_console.c
>>>  head/stand/efi/loader/arch/arm/Makefile.inc
>>>  head/stand/efi/loader/arch/arm64/Makefile.inc
>>>  head/stand/efi/loader/conf.c
>>>  head/stand/efi/loader/main.c
>>>
>>> Modified: head/stand/efi/libefi/efi_console.c
>>> ==
>>> --- head/stand/efi/libefi/efi_console.c Sat Mar 14 05:57:22 2020
>>> (r358988)
>>> +++ head/stand/efi/libefi/efi_console.c Sat Mar 14 06:36:03 2020
>>> (r358989)
>>> @@ -377,9 +377,22 @@ efi_cons_respond(void *s __unused, const void *buf __u
>>> {
>>> }
>>>
>>> +/*
>>> + * Set up conin/conout/coninex to make sure we have input ready.
>>> + */
>>> static void
>>> efi_cons_probe(struct console *cp)
>>> {
>>> +   EFI_STATUS status;
>>> +
>>> +   conout = ST->ConOut;
>>> +   conin = ST->ConIn;
>>> +
>>> +   status = BS->OpenProtocol(ST->ConsoleInHandle, &simple_input_ex_guid,
>>> +   (void **)&coninex, IH, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
>>> +   if (status != EFI_SUCCESS)
>>> +   coninex = NULL;
>>> +
>>> cp->c_flags |= C_PRESENTIN | C_PRESENTOUT;
>>> }
>>>
>>> @@ -889,15 +902,7 @@ efi_cons_init(int arg)
>>> if (conin != NULL)
>>> return (0);
>>>
>>> -   conout = ST->ConOut;
>>> -   conin = ST->ConIn;
>>> -
>>> conout->EnableCursor(conout, TRUE);
>>> -   status = BS->OpenProtocol(ST->ConsoleInHandle, &simple_input_ex_guid,
>>> -   (void **)&coninex, IH, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
>>> -   if (status != EFI_SUCCESS)
>>> -   coninex = NULL;
>>> -
>>> if (efi_cons_update_mode())
>>> return (0);
>> Hello, Toomas!
>>
>> I have to return to this revision once again.
>>
>> Speaking in advance, the problem I'll describe isn't a fatal one.  I
>> want to find a solution/root cause by myself... well, I had tried to do
>> that but failed, therefore, I need some tips from you, if you have free
>> time for that.
>>
>> The loader started to ignore teken.fg_color after r358989.
>>
>> I like to have green text on black console.  Therefore, I have this:
>>
>> teken.fg_color="green"
> 
> 
> Oh cool, at least it is useful for someone:)
> 
> I am sorry, yes this is my bug, I somehow missed the second probe and assumed 
> we do probe only once.. And yes, your analysis is correct, the environment 
> with callback should be treated carefully.
> 
> What probe must do is to set up conin/coninex so the efiserial can use 
> workaround for buggy SIO, the rest is not that important.
> 
> 
>>
>> in my /boot/loader.conf.  Before r358989 everything worked just like I
>> wanted: not only vt(4) had green text on black, but the loader menu
>> also.  After r358989 vt(4) still renders greeen text on black, but the
>> loader doesn't.  It use default white on black.  The variable is
>> assigned but doesn't affect the output:
>>
>> OK show teken.fg_color
>> green
>>
>> That started to happen after the changes from above: when code from the
>> efi_cons_init() was moved to the efi_cons_probe()
>> (stand/efi/libefi/efi_console.c).  Therefore, if I revert those only
>> changes, the loader starts to draw green text on black.
>>
>> If I read the sources correctly, the cons_probe() function in
>> stand/common/console.c calls both those functions.  Moreover, the
>> efi_cons_probe() is called twice: first time when the cons_probe()
>> probes all available consoles, and then when it searches an "online"
>> console.  And then the cons_probe() calls the efi_cons_init().  I see
>> nothing between those calls which may cause the loader to ignore
>> teken.fg_color (or any other variable).
>>
>> I believe that the efi_set_colors() function from
>> stand/efi/libefi/efi_console.c is not call being the hook function for
>> the teken.fg_color variable.  The efi_cons_update_mode() sets the
>> efi_set_colors() as the callback for teken.fg_color, but it's never
>> called.  The only reason for that, according to code of the env_setenv()
>> in stand/libsa/environment.c, is that teken.fg_color was already created
>> (without the hook function, of course) when the efi_cons_update_mode()
>> tries to assign the efi_set_colors() hook.  Or, the
>> efi_cons_update_mode() failed to allocate the buffer, and, therefore,
>> didn't set teken.fg_color at all.  And later teken.fg_color is read from
>> /boot/loader.conf.
>>
>> One more evidence that efi_set_colors() is not called: setting
>> tek

svn commit: r359421 - head/stand/libsa

[Toomas Soome]

Author: tsoome
Date: Sun Mar 29 06:48:59 2020
New Revision: 359421
URL: https://svnweb.freebsd.org/changeset/base/359421

Log:
  loader: use #elif defined() in stand.h
  
  Small cleanup.
  
  Reported by:  imp

Modified:
  head/stand/libsa/stand.h

Modified: head/stand/libsa/stand.h
==
--- head/stand/libsa/stand.hSun Mar 29 06:25:57 2020(r359420)
+++ head/stand/libsa/stand.hSun Mar 29 06:48:59 2020(r359421)
@@ -443,7 +443,7 @@ extern void *calloc(size_t, size_t);
 extern void free(void *);
 extern void *realloc(void *, size_t);
 extern void *reallocf(void *, size_t);
-#elif DEBUG_MALLOC
+#elif defined(DEBUG_MALLOC)
 #define malloc(x)  Malloc(x, __FILE__, __LINE__)
 #define memalign(x, y) Memalign(x, y, __FILE__, __LINE__)
 #define calloc(x, y)   Calloc(x, y, __FILE__, __LINE__)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r358989 - in head/stand/efi: libefi loader loader/arch/arm loader/arch/arm64

[Toomas Soome via svn-src-all]

> On 29. Mar 2020, at 09:40, Ruslan Garipov  wrote:
> 
>>> 
>> 
>> That definitely can be the case. If you do not set any custom values, 
>> missing tem.* variables would confirm that.
>> 
>> Now, there is still an question, why in your system that allocation does 
>> fail?
> Is there a way I can help you to figure that out?  I'm afraid I will not
> have an access to my systems during the following week, but even so.

Hi!

Please test latest current:)

thanks,
toomas

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"