Re: [PATCH, libressl] discuss: removal of padding extension?

2014-07-23 Thread Claus Assmann
On Wed, Jul 23, 2014, Ted Unangst wrote:
 On Wed, Jul 23, 2014 at 10:20, Hanno B??ck wrote:

  Quick background: Some router firmwares from F5 have a bug that they
  fail if the SSL handshake is between 256 and 511 bytes.

Is this the same problem discussed in
Message-ID: 20140410170056.gi12...@mournblade.imrryr.org
on the openssl-users list?
Subject: Re: openssl update 1.0.1f to 1.0.1g broke sendmail
(SSL23_GET_SERVER_HELLO:tlsv1 alert decode error)

  Following up that openssl and other major ssl implementations
  introduced a TLS padding extension that does nothing else than padding
  the handshake if it is between these sizes.

 hmm. the workaround isn't particularly intrusive imo. also, while our
 policy has been minimal workarounds, i think that applies to the host
 operating system. interop compat is a different beast.

Yes -- if it is the problem referenced above then it breaks some
other software, i.e., some MTAs.



Re: openssl's *strlcy

2014-04-18 Thread Claus Assmann
Seems it is ok to use strlcat/strlcpy that way in some cases:
$ cat src/usr.sbin/smtpd/*.c | egrep -c ' strlc(at|py)\('
249



vfprintf.c: use ssize_t for ssizearg

2010-10-16 Thread Claus Assmann
Should the type of ssizearg be ssize_t?

Index: vfprintf.c
===
RCS file: cvs/src/lib/libc/stdio/vfprintf.c,v
retrieving revision 1.58
diff -u -r1.58 vfprintf.c
--- vfprintf.c  9 Nov 2009 00:18:27 -   1.58
+++ vfprintf.c  17 Oct 2010 01:34:24 -
@@ -62,7 +62,7 @@
unsigned long long  ulonglongarg;
ptrdiff_t   ptrdiffarg;
size_t  sizearg;
-   size_t  ssizearg;
+   ssize_t ssizearg;
intmax_tintmaxarg;
uintmax_t   uintmaxarg;
void*pvoidarg;



add Radeon HD 4250 to sys/dev/pci/pcidevs

2011-01-08 Thread Claus Assmann
I tried OpenBSD 4.8 on my new computer (dmesg was sent to dmesg@
before; is also appended below), but several things don't work,
including X (I can send the Xorg log if someone is interested),
below is an addition of the pci id.

Index: pcidevs
===
RCS file: /home/ca/OpenBSD/cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1583
diff -u -r1.1583 pcidevs
--- pcidevs 3 Jan 2011 06:58:24 -   1.1583
+++ pcidevs 8 Jan 2011 17:19:36 -
@@ -1360,6 +1360,7 @@
 product ATI RADEON_HD4200_HDA  0x970f  Radeon HD 4200 HD Audio
 product ATI RADEON_HD4200  0x9710  Radeon HD 4200
 product ATI RADEON_HD4200_M0x9712  Mobility Radeon HD 4200
+product ATI RADEON_HD4250  0x9715  Radeon HD 4250
 product ATI RADEON_HD2600_HDA  0xaa08  Radeon HD 2600 HD Audio
 product ATI RS690M_HDA 0xaa10  RS690M HD Audio
 product ATI RADEON_HD3870_HDA  0x0018  Radeon HD 3870 HD Audio




OpenBSD 4.8 (GENERIC.MP) #335: Mon Aug 16 09:09:20 MDT 2010
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 3486973952 (3325MB)
avail mem = 3380334592 (3223MB)
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.5 @ 0x9f000 (64 entries)
bios0: vendor American Megatrends Inc. version 1007 date 03/25/2010
bios0: ASUSTeK Computer INC. M4A88TD-M
acpi0 at bios0: rev 2
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP APIC MCFG OEMB HPET SSDT
acpi0: wakeup devices PCE2(S4) PCE3(S4) PCE5(S4) PCE6(S4) PCE7(S4) PCE9(S4) 
PCEA(S4) RLAN(S4) SBAZ(S4) P0PC(S4) GEC_(S4) UHC1(S4) UHC2(S4) USB3(S4) 
UHC4(S4) USB5(S4) UHC6(S4) UHC7(S4) PS2M(S4) PS2K(S4) UAR1(S4)
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Phenom(tm) II X6 1055T Processor, 2812.85 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu0: apic clock running at 200MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD Phenom(tm) II X6 1055T Processor, 2812.47 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu2 at mainbus0: apid 2 (application processor)
cpu2: AMD Phenom(tm) II X6 1055T Processor, 2812.47 MHz
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu2: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu3 at mainbus0: apid 3 (application processor)
cpu3: AMD Phenom(tm) II X6 1055T Processor, 2812.47 MHz
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu3: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu4 at mainbus0: apid 4 (application processor)
cpu4: AMD Phenom(tm) II X6 1055T Processor, 2812.47 MHz
cpu4: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu4: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu4: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu4: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu5 at mainbus0: apid 5 (application processor)
cpu5: AMD Phenom(tm) II X6 1055T Processor, 2812.47 MHz
cpu5: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu5: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu5: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu5: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
ioapic0 at mainbus0: apid 6 pa 0xfec0, version 21, 24 pins
acpihpet0 at acpi0: 

Re: [patch]rcs: comment typo

2014-11-29 Thread Claus Assmann
On Sat, Nov 29, 2014, Fritjof Bornebusch wrote:

 it's NULL not NUL.

Not in this case...

NULL: is a pointer (usually 0)
NUL: is a character ('\0')



Re: panic: ehci_device_clear_toggle: queue active

2014-12-12 Thread Claus Assmann
On Fri, Dec 12, 2014, Abel Abraham Camarillo Ojeda wrote:
 I think this problem is particular to these machine
 because I cannot reproduce in my other openbsd

Something similar happens on a Dell 6150 laptop (see below).
The same (ANT+) USB stick does not trigger a panic on a Dell D830
(running some older OpenBSD version).
The panic is triggered when GoldenCheetah tries to access the ANT+
stick.
It seems something like this has been reported before; I found a
few hits yesterday when I encountered the problem, but didn't see
a solution in those mails.


panic: ehci_device_clear_toggle: queue active
...
Debugger() at Debugger+0x9
ehci_device_clear_toggle() at ehci_device_clear_toggle+0x2b
usbd_clear_endpoint_stall() at usbd_clear_endpoint_stall+0x24
ugen_do_read() at ugen_do_read+0x4bc
ugenread() at ugenread+0x48
spec_read() at spec_read_0x2c3
VOP_READ() at VOP_READ+0x3f
vn_read() at vn_read+0xa1
dofilereadv() at dofilereadv+0x1c4
sys_read() at sys_read+0xaa
syscall() at syscall+0x297
--- syscall (number 3) ---
end of kernel
end trace frame: 0x81, count: -12
0x11fd0fdbef8a:

  PID  PPID  PGRP  UID  S  FLAGS WAIT COMMAND
  7815 13631 13631 1037 3  0x83  thrsleep GoldenCheetah
  1997 13631 13631 1037 3 0x483  select   GoldenCheetah
 30002 13631 13631 1037 3 0x483  thrsleep GoldenCheetah
 24210 13631 13631 1037 3 0x483  poll GoldenCheetah
*19973 13631 13631 1037 7 0x483   GoldenCheetah
 13631 30656 13631 1037 3  0x8b  pausesh
... xterms ...
 17380 0 00 3   0x14200  usbtsk   usbtask
  1821 0 00 3   0x14200  usbatsk  usbatask

OpenBSD 5.6 (GENERIC.MP) #333: Fri Aug  8 00:20:21 MDT 2014
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
RTC BIOS diagnostic error 30config_unit,memory_size
real mem = 8495951872 (8102MB)
avail mem = 8261009408 (7878MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xf2440 (67 entries)
bios0: vendor Dell Inc. version A12 date 05/09/2012
bios0: Dell Inc. Latitude E6510
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC TCPA MCFG HPET BOOT SLIC SSDT
acpi0: wakeup devices AGP_(S4) P0P1(S4) UAR1(S3) HDEF(S4) PXSX(S4) RP01(S4) 
PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) PXSX(S4) RP04(S4) PXSX(S4) RP05(S4) 
PXSX(S4) RP07(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i7 CPU M 620 @ 2.67GHz, 2449.14 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,AES,NXE,LONG,LAHF,PERF,ITSC
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 132MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.1.0, IBE
cpu1 at mainbus0: apid 4 (application processor)
cpu1: Intel(R) Core(TM) i7 CPU M 620 @ 2.67GHz, 2314.35 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,AES,NXE,LONG,LAHF,PERF,ITSC
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 0, core 2, package 0
cpu2 at mainbus0: apid 1 (application processor)
cpu2: Intel(R) Core(TM) i7 CPU M 620 @ 2.67GHz, 2345.20 MHz
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,AES,NXE,LONG,LAHF,PERF,ITSC
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 1, core 0, package 0
cpu3 at mainbus0: apid 5 (application processor)
cpu3: Intel(R) Core(TM) i7 CPU M 620 @ 2.67GHz, 2344.81 MHz
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,AES,NXE,LONG,LAHF,PERF,ITSC
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 2, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf800, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (AGP_)
acpiprt2 at acpi0: bus 10 (P0P1)
acpiprt3 at acpi0: bus 1 (RP01)
acpiprt4 at acpi0: bus -1 (RP02)
acpiprt5 at acpi0: bus 2 (RP03)
acpiprt6 at acpi0: bus 4 (RP04)
acpiprt7 at acpi0: bus -1 (RP05)
acpiprt8 at acpi0: bus -1 (RP07)
acpiprt9 at acpi0: bus -1 (RP08)
acpiprt10 at acpi0: bus -1 (PEG3)
acpiprt11 at acpi0: bus -1 (PEG5)
acpiec0 at acpi0
acpicpu0 at acpi0: C3, C1, PSS
acpicpu1 at acpi0: C3, C1, PSS
acpicpu2 at acpi0: C3, C1, PSS
acpicpu3 at acpi0: C3, C1, PSS
acpibtn0 at acpi0: LID_

Re: disklabel template: percentage of disk optional?

2016-10-04 Thread Claus Assmann
On Tue, Oct 04, 2016, Otto Moerbeek wrote:
> On Tue, Oct 04, 2016 at 04:00:50AM -0700, Claus Assmann wrote:

> > This doesn't seem to resolve the problem that sa->rate is
> > not initialized, so a simple file like this still triggers

> Likely, this is better.

> RCS file: /cvs/src/sbin/disklabel/editor.c,v

>   sa = &(alloc_table[0].table[idx]);
> + memset(sa, 0, sizeof(*sa));

Clearing the entire struct is certainly the easiest approach.
Thanks.



Re: disklabel template: percentage of disk optional?

2016-10-04 Thread Claus Assmann
On Tue, Oct 04, 2016, Dmitrij D. Czarkoff wrote:

[please do not Cc me]

> I shouldn't have started on sending patches at 3AM.  This one should do
> what I intended it to do.  Sorry for noise.

> + else if (t == NULL && sa->minsz != sa->maxsz)
> + errx(1, "%s: parse error on line %u", filename, idx);

This doesn't seem to resolve the problem that sa->rate is
not initialized, so a simple file like this still triggers
the error message (at least in my tests):

/   500M
swap1G
/usr2G
/home   500G



disklabel template: percentage of disk optional?

2016-10-03 Thread Claus Assmann
While playing around with the autoinstaller and autodisklayout I
ran into several problems, some of which I worked around and for
one I created a possible patch, but I'm not sure if that's the right
thing to do.

I have a disklayout template like this:

/   500M
swap1G
/tmp1G-2G
/var10G-16G
/usr2G-4G
/usr/X11R6  1G-1G
/usr/local  200G-250G
/usr/obj2G-4G
/usr/src2G-4G
/home   500G-*

but disklabel failed with
"sum of extra space allocation > 100%"
AFAICT the "percentage of disk" is optional, and if so, maybe the
following patch should be applied (to initialize the variable as
it may contain a bogus value thus triggering the error)?

Index: editor.c
===
RCS file: cvs/src/sbin/disklabel/editor.c,v
retrieving revision 1.303
diff -u -r1.303 editor.c
--- editor.c2 Sep 2016 10:47:17 -   1.303
+++ editor.c3 Oct 2016 22:56:55 -
@@ -2388,6 +2388,7 @@
sa = &(alloc_table[0].table[idx]);
idx++;
 
+   sa->rate = 0;
if ((sa->mp = get_token(, )) == NULL ||
(sa->mp[0] != '/' && strcmp(sa->mp, "swap")))
errx(1, "%s: parse error on line %u", filename, idx);



typo/cosmetics/consistency: src/distrib/notes/m4.common

2016-10-15 Thread Claus Assmann
Not sure whether this is useful, but here it goes:
typo: "chosen"
consistency: 'z' instead of 's' (seems to be used in the rest too)
cosmetics: space at end of line.

Index: m4.common
===
RCS file: /home/ca/OpenBSD/cvs/src/distrib/notes/m4.common,v
retrieving revision 1.121
diff -u -r1.121 m4.common
--- m4.common   28 Jul 2016 17:19:24 -  1.121
+++ m4.common   15 Oct 2016 23:51:54 -
@@ -288,7 +288,7 @@
the hardware that was detected and supported by OpenBSD.
 
 dnl dot.profile
-   After the kernel is done initialising, you will be asked whether
+   After the kernel is done initializing, you will be asked whether
you wish to do an "(I)nstall", "(U)pgrade" or an "(A)utoinstall".
Enter 'I' for a fresh install or 'U' to upgrade an existing
installation.  Enter 'A' to start an unattended installation
@@ -743,10 +743,10 @@
 Preparing an unattended installation of OpenBSD:
 
 
-If '(A)utoinstall' is choosen at the install prompt or if the
+If '(A)utoinstall' is chosen at the install prompt or if the
 installation system detects that it booted from the network, and
 isn't interrupted within 5 seconds, it attempts a fully-automatic
-installation. 
+installation.
 
 The installer runs dhclient(8) on the network interface the system
 booted from, or in case of multiple interfaces it will ask which one
@@ -824,7 +824,7 @@
 When prompted, select the (U)pgrade option rather than the (I)nstall
 option at the prompt in the install process.
 
-You will be presented with a welcome message, and depending on how you are 
+You will be presented with a welcome message, and depending on how you are
 connected to the system, you will be asked to set the terminal type or to
 choose a keyboard layout.
 



Re: regarding OpenSSL License change

2017-03-23 Thread Claus Assmann
So did anyone who replied with "NO" get a followup to "reconsider"?
I only "contributed" some doc fixes, so my "vote" doesn't really
mean much.



uniq: add -i option

2017-12-15 Thread Claus Assmann
I use uniq for some log file analysis and it contained "duplicate"
lines which only differ in lower/upper case (user input). Hence I
added an -i flag which also exists on FreeBSD at least.
Maybe it's useful to add to OpenBSD?

Index: uniq.1
===
RCS file: /home/ca/OpenBSD/cvs/src/usr.bin/uniq/uniq.1,v
retrieving revision 1.19
diff -u -r1.19 uniq.1
--- uniq.1  24 Oct 2016 13:46:58 -  1.19
+++ uniq.1  15 Dec 2017 11:35:53 -
@@ -43,6 +43,7 @@
 .Nm uniq
 .Op Fl c
 .Op Fl d | u
+.Op Fl i
 .Op Fl f Ar fields
 .Op Fl s Ar chars
 .Oo
@@ -73,6 +74,8 @@
 A field is a string of non-blank characters separated from adjacent fields
 by blanks, with blanks considered part of the following field.
 Field numbers are one based, i.e., the first field is field one.
+.It Fl i
+Case insensitive comparison of lines.
 .It Fl s Ar chars
 Ignore the first
 .Ar chars
Index: uniq.c
===
RCS file: /home/ca/OpenBSD/cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.24
diff -u -r1.24 uniq.c
--- uniq.c  19 Dec 2015 10:21:01 -  1.24
+++ uniq.c  15 Dec 2017 11:30:46 -
@@ -47,7 +47,7 @@
 
 #defineMAXLINELEN  (8 * 1024)
 
-int cflag, dflag, uflag;
+int cflag, dflag, uflag, iflag;
 int numchars, numfields, repeats;
 
 FILE   *file(char *, char *);
@@ -70,7 +70,7 @@
err(1, "pledge");
 
obsolete(argv);
-   while ((ch = getopt(argc, argv, "cdf:s:u")) != -1) {
+   while ((ch = getopt(argc, argv, "cdf:is:u")) != -1) {
const char *errstr;
 
switch (ch) {
@@ -87,6 +87,9 @@
errx(1, "field skip value is %s: %s",
errstr, optarg);
break;
+   case 'i':
+   iflag = 1;
+   break;
case 's':
numchars = (int)strtonum(optarg, 0, INT_MAX,
);
@@ -149,7 +152,7 @@
}
 
/* If different, print; set previous to new value. */
-   if (strcmp(t1, t2)) {
+   if ((!iflag && strcmp(t1, t2)) || strcasecmp(t1, t2)) {
show(ofp, prevline);
t1 = prevline;
prevline = thisline;



Re: uniq: add -i option

2017-12-21 Thread Claus Assmann
On Fri, Dec 15, 2017, Todd C. Miller wrote:
> On Fri, 15 Dec 2017 03:41:25 -0800, Claus Assmann wrote:

> > I use uniq for some log file analysis and it contained "duplicate"
> > lines which only differ in lower/upper case (user input). Hence I
> > added an -i flag which also exists on FreeBSD at least.
> > Maybe it's useful to add to OpenBSD?

> Linux has this as well.  It's OK by me.

So would it be ok for you to commit it or does it have to be someone
else (with the proper rights and some spare time) based on your "OK"?



Re: uniq: add -i option

2017-12-21 Thread Claus Assmann
On Thu, Dec 21, 2017, Theo Buehler wrote:

> I committed a minimally tweaked version of your diff:

Thanks for the fixes and the commit, I will try to do
better next time.



typos in src/distrib/miniroot/install.sub

2019-01-13 Thread Claus Assmann
This might not be worth mailing here, but maybe someone will look
at it anyway.
Notes:
- I did not reformat the first paragraph after adding the missing
'u' (the diff just shows the typo) -- the line is too long now.

- Maybe it should be
# Functions used in install.sh/upgrade.sh and their associates.
but that's for someone else to decide.

Index: install.sub
===
RCS file: /home/ca/OpenBSD/cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.1104
diff -u -r1.1104 install.sub
--- install.sub 22 Sep 2018 09:12:36 -  1.1104
+++ install.sub 13 Jan 2019 11:14:52 -
@@ -547,7 +547,7 @@
(
while :; do
lock
-   # The dmesg listener will continously check for the existence of
+   # The dmesg listener will continuously check for the existence 
of
# the update file and sends a signal to the parent process (that
# is the installer script) if the dmesg output differs from the
# contents of that file.
@@ -1244,7 +1244,7 @@
rm -f /tmp/i/mygate
 
while :; do
-   # Discover last configured vlan interface and increment it's
+   # Discover last configured vlan interface and increment its
# minor for the next offered vlan interface.
_vi=$(get_ifs vlan | sed '$!d;s/^vlan//')
[[ -n $_vi ]] && ((_vi++))
@@ -1956,7 +1956,7 @@
 
 
 # 
--
-# Functions used in install.sh/upgrade.sh and it's associates
+# Functions used in install.sh/upgrade.sh and its associates
 # 
--
 
 # Ask for terminal type if on console, otherwise ask for/set keyboard layout.
@@ -2103,7 +2103,7 @@
((${#resp} <= 31)) && break
;;
esac
-   echo "$resp is not a useable loginname."
+   echo "$resp is not a usable loginname."
done
ADMIN=$resp
while :; do


-- 
Address is valid for this mailing list only.



Re: Change to mailer.conf(5) man page

2018-09-15 Thread Claus Assmann
On Sat, Sep 15, 2018, Matt Schwartz wrote:

> reflect that the sendmail binary would be in
> /usr/local/libexec/sendmail instead of /usr/libexec/sendmail.

In that case you might want to change the comment too
(or simply remove it...)

>  # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail

> +sendmail   /usr/local/libexec/sendmail/sendmail



Re: vacation.1: correct .forward file example

2021-01-21 Thread Claus Assmann
On Thu, Jan 21, 2021, Martin Vahlensieck wrote:

> I think the backslash at the beginning of the line is an error.

Why? Does it fail when used as described?

> -\eeric, "|/usr/bin/vacation -a allman eric"

Originally this was to avoid recursion, i.e.,
\eric
will not be expanded again.

Maybe that has been changed (with smtpd instead of sendmail) so it
is not necessary anymore?

-- 
Address is valid for this mailing list only, please do not reply
to it direcly, but to the list.



Re: DANE in libressl?

2021-08-29 Thread Claus Assmann
On Sun, Aug 29, 2021, Peter J. Philipp wrote:

> I can stick to just rolling the needed functionality in the syslogd.

Maybe you can start with the code from Viktor Dukhovni
https://github.com/vdukhovni/ssl_dane
  THIS CODE IS IN THE PUBLIC DOMAIN.
so it can be freely used.
It would be nice to have the full functionality in LibreSSL.

-- 
Address is valid for this mailing list only, please do not reply
to it direcly, but to the list.



Re: fortune(6): Veni, vidi, vici

2021-08-23 Thread Claus Assmann
On Mon, Aug 23, 2021, Alessandro De Laurenzis wrote:

> and this could be a wordplay joke,

AFAICT it is.

-- 
Address is valid for this mailing list only, please do not reply
to it direcly, but to the list.



Re: [patch] netcat: support --crlf

2023-08-25 Thread Claus Assmann
On Fri, Aug 25, 2023, Theo de Raadt wrote:
> Pietro Cerutti  wrote:

> > The motivation is that several network protocols are line oriented
> > with CRLF as line terminators. SMTP and HTTP are among the most
> > popular.

> Yet, all servers of those protocols and and will accept the simpler 1-byte
> line terminator.

That is incorrect.

Some SMTP servers will insist on CRLF as line ending,
esp. when it comes to EOM.

-- 
Address is valid for this mailing list only, please do not reply
to it directly, but to the list.