Nabble - openbsd dev - tech

Re: typo /cvs/src/sbin/ping/ping.c

2009-12-23T03:54:05Z

On Wed, Dec 23, 2009 at 12:27 PM, Han Boetes <han@...> wrote:
> Good finds. To make them even better make sure your mta doesn't
> wrap the lines. ;-)

indeed, good ones. i have sent a diff with all the remaining changes
to jmc@ for review (there is one that has been committed by krw@ as a
part of a larger diff). i will commit them as soon as i get an ok to
them.

Re: typo /cvs/src/sbin/ping/ping.c

2009-12-23T03:27:44Z

Good finds. To make them even better make sure your mta doesn't
wrap the lines. ;-)

Brad Tilley wrote:

> # cvs diff -Nup ping.c
> Index: ping.c
> ===================================================================
> RCS file: /cvs/src/sbin/ping/ping.c,v
> retrieving revision 1.85
> diff -N -u -p ping.c
> --- ping.c 15 Dec 2009 21:09:43 -0000 1.85
> +++ ping.c 23 Dec 2009 01:16:59 -0000
> @@ -1085,7 +1085,7 @@ pr_icmph(struct icmp *icp)
> (void)printf("Destination Net Unreachable for
> TOS\n");
> break;
> case ICMP_UNREACH_TOSHOST:
> - (void)printf("Desination Host Unreachable for
> TOS\n");
> + (void)printf("Destination Host Unreachable for
> TOS\n");
> break;
> case ICMP_UNREACH_FILTER_PROHIB:
> (void)printf("Route administratively
> prohibited\n");
>

# Han

typo /cvs/src/sbin/shutdown/shutdown.c

2009-12-22T17:24:00Z

# cvs diff -Nup shutdown.c
Index: shutdown.c
===================================================================
RCS file: /cvs/src/sbin/shutdown/shutdown.c,v
retrieving revision 1.35
diff -N -u -p shutdown.c
--- shutdown.c 27 Oct 2009 23:59:34 -0000 1.35
+++ shutdown.c 23 Dec 2009 01:23:31 -0000
@@ -310,7 +310,7 @@ timewarn(int timeleft)

/*
* play some games, just in case wall doesn't come back
- * probably unecessary, given that wall is careful.
+ * probably unnecessary, given that wall is careful.
*/
if (!setjmp(alarmbuf)) {
(void)signal(SIGALRM, timeout);

typos /cvs/src/sbin/ping6/ping6.c

2009-12-22T17:20:44Z

# cvs diff -Nup ping6.c
Index: ping6.c
===================================================================
RCS file: /cvs/src/sbin/ping6/ping6.c,v
retrieving revision 1.76
diff -N -u -p ping6.c
--- ping6.c 2 Nov 2009 22:31:50 -0000 1.76
+++ ping6.c 23 Dec 2009 01:20:03 -0000
@@ -566,7 +566,7 @@ main(int argc, char *argv[])
}

/*
- * let the kerel pass extension headers of incoming packets,
+ * let the kernel pass extension headers of incoming packets,
* for privileged socket options
*/
if ((options & F_VERBOSE) != 0) {
@@ -664,7 +664,7 @@ main(int argc, char *argv[])
}
#endif /*ICMP6_FILTER*/

- /* let the kerel pass extension headers of incoming packets */
+ /* let the kernel pass extension headers of incoming packets */
if ((options & F_VERBOSE) != 0) {
int opton = 1;

@@ -939,7 +939,7 @@ main(int argc, char *argv[])

/*
* receive control messages only. Process the
- * exceptions (currently the only possiblity is
+ * exceptions (currently the only possibility is
* a path MTU notification.)
*/
if ((mtu = get_pathmtu(&m)) > 0) {
@@ -1582,7 +1582,7 @@ pr_ip6opt(void *extbuf)
switch (type) {
/*
* Note that inet6_opt_next automatically skips any
padding
- * optins.
+ * options.
*/
case IP6OPT_JUMBO:
offset = 0;
@@ -1780,7 +1780,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen)

/*
* In icmp-name-lookups 05 and later, TTL of each returned
address
- * is contained in the resposne. We try to detect the version
+ * is contained in the response. We try to detect the version
* by the length of the data, but note that the detection
algorithm
* is incomplete. We assume the latest draft by default.
*/

typo /cvs/src/sbin/ping/ping.c

2009-12-22T17:17:34Z

# cvs diff -Nup ping.c
Index: ping.c
===================================================================
RCS file: /cvs/src/sbin/ping/ping.c,v
retrieving revision 1.85
diff -N -u -p ping.c
--- ping.c 15 Dec 2009 21:09:43 -0000 1.85
+++ ping.c 23 Dec 2009 01:16:59 -0000
@@ -1085,7 +1085,7 @@ pr_icmph(struct icmp *icp)
(void)printf("Destination Net Unreachable for
TOS\n");
break;
case ICMP_UNREACH_TOSHOST:
- (void)printf("Desination Host Unreachable for
TOS\n");
+ (void)printf("Destination Host Unreachable for
TOS\n");
break;
case ICMP_UNREACH_FILTER_PROHIB:
(void)printf("Route administratively
prohibited\n");

typos /cvs/src/sbin/pflogd/privsep.c

2009-12-22T17:14:23Z

# cvs diff -Nup privsep.c
Index: privsep.c
===================================================================
RCS file: /cvs/src/sbin/pflogd/privsep.c,v
retrieving revision 1.16
diff -N -u -p privsep.c
--- privsep.c 25 Oct 2006 20:55:04 -0000 1.16
+++ privsep.c 23 Dec 2009 01:13:04 -0000
@@ -200,7 +200,7 @@ move_log(const char *name)
return (1);
}

- /* lock destinanion */
+ /* lock destination */
fd = open(ren, O_CREAT|O_EXCL, 0);
if (fd >= 0) {
close(fd);
@@ -323,7 +323,7 @@ may_read(int fd, void *buf, size_t n)
}

/* Read data with the assertion that it all must come through, or
- * else abort the process. Based on atomicio() from openssh. */
+ * else abort the process. Based on atomicio() from OpenSSH. */
static void
must_read(int fd, void *buf, size_t n)
{
@@ -345,7 +345,7 @@ must_read(int fd, void *buf, size_t n)
}

/* Write data with the assertion that it all has to be written, or
- * else abort the process. Based on atomicio() from openssh. */
+ * else abort the process. Based on atomicio() from OpenSSH. */
static void
must_write(int fd, void *buf, size_t n)
{

typo /cvs/src/sbin/pfctl/pfctl_parser.c

2009-12-22T17:10:31Z

# cvs diff -Nup pfctl_parser.c
Index: pfctl_parser.c
===================================================================
RCS file: /cvs/src/sbin/pfctl/pfctl_parser.c,v
retrieving revision 1.253
diff -N -u -p pfctl_parser.c
--- pfctl_parser.c 14 Dec 2009 12:31:45 -0000 1.253
+++ pfctl_parser.c 23 Dec 2009 01:09:45 -0000
@@ -1247,7 +1247,7 @@ ifa_exists(const char *ifa_name)
if (iftab == NULL)
ifa_load();

- /* check wether this is a group */
+ /* check whether this is a group */
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
err(1, "socket");
bzero(&ifgr, sizeof(ifgr));

typo /cvs/src/sbin/pfctl/parse.y

2009-12-22T17:09:15Z

# cvs diff -Nup parse.y
Index: parse.y
===================================================================
RCS file: /cvs/src/sbin/pfctl/parse.y,v
retrieving revision 1.576
diff -N -u -p parse.y
--- parse.y 10 Dec 2009 15:57:20 -0000 1.576
+++ parse.y 23 Dec 2009 01:08:38 -0000
@@ -546,7 +546,7 @@ include : INCLUDE STRING
{
;

/*
- * apply to previouslys specified rule: must be careful to note
+ * apply to previously specified rule: must be careful to note
* what that is: pf or nat or binat or rdr
*/
fakeanchor : fakeanchor '\n'

typo /cvs/src/sbin/pfctl/pfctl_osfp.c

2009-12-22T17:08:13Z

# cvs diff -Nup pfctl_osfp.c
Index: pfctl_osfp.c
===================================================================
RCS file: /cvs/src/sbin/pfctl/pfctl_osfp.c,v
retrieving revision 1.15
diff -N -u -p pfctl_osfp.c
--- pfctl_osfp.c 13 Dec 2006 05:10:15 -0000 1.15
+++ pfctl_osfp.c 23 Dec 2009 01:07:19 -0000
@@ -976,7 +976,7 @@ get_tcpopts(const char *filename, int lineno, const
ch
return (0);
}

-/* rip the next field ouf of a formatted config file line */
+/* rip the next field out of a formatted config file line */
char *
get_field(char **line, size_t *len, int *fieldlen)
{

typos /cvs/src/sbin/newfs/mkfs.c

2009-12-22T16:56:22Z

# cvs diff -Nup mkfs.c
Index: mkfs.c
===================================================================
RCS file: /cvs/src/sbin/newfs/mkfs.c,v
retrieving revision 1.72
diff -N -u -p mkfs.c
--- mkfs.c 8 Aug 2008 23:49:53 -0000 1.72
+++ mkfs.c 23 Dec 2009 00:55:40 -0000
@@ -592,7 +592,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int
fo,
((char *)fscs) + i);

/*
- * Update information about this partion in pack label, to that
it may
+ * Update information about this partition in pack label, so
that it may
* be updated on disk.
*/
pp->p_fstype = FS_BSDFFS;

arrayified - consistent usage

2009-12-22T16:47:25Z

The made up words arrayified and arrayify are found several other times
in this file. In this instance, it is misspelled:

# cvs diff -Nup dump.h
Index: dump.h
===================================================================
RCS file: /cvs/src/sbin/dump/dump.h,v
retrieving revision 1.16
diff -N -u -p dump.h
--- dump.h 3 Jun 2007 20:16:08 -0000 1.16
+++ dump.h 23 Dec 2009 00:43:27 -0000
@@ -168,7 +168,7 @@ struct dumptime {
struct dumptime *dthead; /* head of the list version */
int nddates; /* number of records (might be zero) */
int ddates_in; /* we have read the increment file */
-struct dumpdates **ddatev; /* the arrayfied version */
+struct dumpdates **ddatev; /* the arrayified version */
void initdumptimes(void);
void getdumptime(void);
void putdumptime(void);

typos in /cvs/src/sbin/disklabel/editor.c

2009-12-22T16:34:20Z

# cvs diff -Nup editor.c
Index: editor.c
===================================================================
RCS file: /cvs/src/sbin/disklabel/editor.c,v
retrieving revision 1.224
diff -N -u -p editor.c
--- editor.c 12 Nov 2009 16:21:03 -0000 1.224
+++ editor.c 23 Dec 2009 00:33:28 -0000
@@ -715,7 +715,7 @@ editor_add(struct disklabel *lp, char *p)

/*
* Increase d_npartitions if necessary. Ensure all new
partitions are
- * zero'ed to avoid inadvertant overlaps.
+ * zero'ed to avoid inadvertent overlaps.
*/
for(; lp->d_npartitions <= partno; lp->d_npartitions++)
memset(&lp->d_partitions[lp->d_npartitions], 0,
sizeof(*pp));
@@ -1659,7 +1659,7 @@ editor_help(char *arg)
case 'D':
puts(
"The 'D' command will set the disk label to the default values as
reported\n"
-"by the disk itself. This similates the case where there is no disk
label.\n");
+"by the disk itself. This simulates the case where there is no disk
label.\n");
break;
case 'd':
puts(

typo /cvs/src/sbin/bioctl/bioctl.c

2009-12-22T16:24:34Z

# cvs diff -Nup bioctl.c
Index: bioctl.c
===================================================================
RCS file: /cvs/src/sbin/bioctl/bioctl.c,v
retrieving revision 1.86
diff -N -u -p bioctl.c
--- bioctl.c 24 Nov 2009 06:06:06 -0000 1.86
+++ bioctl.c 23 Dec 2009 00:23:53 -0000
@@ -613,7 +613,7 @@ bio_setblink(char *name, char *arg, int blink)
if (rv == 0)
return;

- /* if the blink didnt work, try to find something that will */
+ /* if the blink didn't work, try to find something that will */

memset(&bi, 0, sizeof(bi));
bi.bi_cookie = bl.bl_cookie;

comment typo /cvs/src/sbin/fdisk/cmd.c

2009-12-22T16:19:39Z

# cvs diff -Nup cmd.c
Index: cmd.c
===================================================================
RCS file: /cvs/src/sbin/fdisk/cmd.c,v
retrieving revision 1.43
diff -N -u -p cmd.c
--- cmd.c 8 Feb 2009 18:03:18 -0000 1.43
+++ cmd.c 23 Dec 2009 00:18:42 -0000
@@ -294,7 +294,7 @@ Xselect(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t
*t
printf("New MBR at offset %d.\n", off);
}

- /* Recursion is beautifull! */
+ /* Recursion is beautiful! */
USER_modify(disk, tt, off, firstoff);
return (CMD_CONT);
}

Re: [PATCH] /usr/bin/sort posix patch

2009-12-22T12:00:12Z

Hi Daniel,

Daniel Dickman wrote on Mon, Dec 21, 2009 at 12:03:28AM -0500:

> The patch below adds support for sort's missing "-C" option (as per
> POSIX:2008). This option behaves like "-c" except that it suppresses
> output on STDERR.

This one just got committed (with minimal tweaking of the code
and quite some tweaking of the manual).

Thank you for the patch!
Ingo

Ofertas de viajes

2009-12-22T11:48:10Z

To view the message, please use an HTML compatible email viewer!

typo /cvs/src/bin/pax/buf_subs.c

2009-12-21T16:15:57Z

# cvs diff -Nup buf_subs.c
Index: buf_subs.c
===================================================================
RCS file: /cvs/src/bin/pax/buf_subs.c,v
retrieving revision 1.22
diff -N -u -p buf_subs.c
--- buf_subs.c 27 Oct 2009 23:59:22 -0000 1.22
+++ buf_subs.c 22 Dec 2009 00:15:18 -0000
@@ -943,7 +943,7 @@ buf_flush(int bufcnt)
} else if (cnt > 0) {
/*
* Oh drat we got a partial write!
- * if format doesnt care about alignment let it
go,
+ * if format doesn't care about alignment let it
go,
* we warned the user in ar_write().... but this
means
* the last record on this volume violates pax
spec....
*/

typo /cvs/src/bin/pax/file_subs.c

2009-12-21T16:14:14Z

# cvs diff -Nup file_subs.c
Index: file_subs.c
===================================================================
RCS file: /cvs/src/bin/pax/file_subs.c,v
retrieving revision 1.31
diff -N -u -p file_subs.c
--- file_subs.c 27 Oct 2009 23:59:22 -0000 1.31
+++ file_subs.c 22 Dec 2009 00:13:27 -0000
@@ -988,7 +988,7 @@ file_flush(int fd, char *fname, int isempt)

/*
* rdfile_close()
- * close a file we have beed reading (to copy or archive). If we
have
+ * close a file we have been reading (to copy or archive). If we
have
* reset access time (tflag) do so (the times are stored in arcn).
*/

typo /cvs/src/bin/pax/cache.c

2009-12-21T16:13:00Z

# cvs diff -Nup cache.c
Index: cache.c
===================================================================
RCS file: /cvs/src/bin/pax/cache.c,v
retrieving revision 1.18
diff -N -u -p cache.c
--- cache.c 27 Oct 2009 23:59:22 -0000 1.18
+++ cache.c 22 Dec 2009 00:12:13 -0000
@@ -267,7 +267,7 @@ name_gid(gid_t gid, int frc)
if ((gr = getgrgid(gid)) == NULL) {
/*
* no match for this gid in the local group file, put in
- * a string that is the gid in numberic format
+ * a string that is the gid in numeric format
*/
if (ptr == NULL)
return("");

in6.c: typo in comment

2009-12-21T15:25:09Z

Index: in6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6.c,v
retrieving revision 1.82
diff -u in6.c
--- in6.c 4 Jun 2009 19:07:21 -0000 1.82
+++ in6.c 21 Dec 2009 23:22:14 -0000
@@ -273,7 +273,7 @@
* route surely exists. With this check, we can avoid to
* delete an interface direct route whose destination is same
* as the address being removed. This can happen when removing
- * a subnet-router anycast address on an interface attahced
+ * a subnet-router anycast address on an interface attached
* to a shared medium.
*/
rt = rtalloc1(ifa->ifa_addr, 0, 0);

Distributors are filling cracks and gaps in software systems with simple add-ons

2009-12-21T12:16:03Z

Distributors are filling cracks and gaps in software systems with simple
add-ons

When you purchase a good suit off the rack, it is often tailored to fit your
body.

Unfortunately, "do-all" software systems, like an off-the-rack suit, may not
fit your company perfectly, which can lead to inefficiencies, lack of access
to key data, and even missed profit opportunities.

A tailored solution, as opposed to a full, custom solution:

Increase Sales-Field reps can track orders, inventory and access past
purchases
Save Time and increase versatility-Workers can access data from anywhere
Fewer Service calls-Customers can securely service and access accounts via
web
Instant Credibility-Show professionalism in the field and on the phone
Turn Key Operation-Easy to use, simple to learn and fast to modify
Save Money-save thousands of dollars by not having individual user fees
We have done extensive work with industrial distributors and suppliers to
tailor existing software systems to fit their business. Our existing
framework of components from within the industry means we can deliver a custom
solution that fits your company at about 20% of the usual cost.

Click here to learn more about our experience and references with industrial
distribution and supply.

Sincerely,

Jan Poehland
Comparatio USA, LLC
4517 Minnetonka Blvd.
Suite 303
St. Louis Park, MN 55416
USA

This is a marketing message. We respect your right to be removed from this
marketing campaign. Removal from this email distribution list is
automatically enforced by our email delivery system. Please click here to be
removed.
If this hyperlink comes through in text format or is not visible please hit
reply to this email and type "Remove" in the subject line. If you have any
problems with this removal link please contact Cindy at 800-757-3715 and we
will handle your request immediately.

Re: snmpd: better support for GETBULK

2009-12-21T04:08:35Z

Hello.

> Could you add few sentences explaining how is it better?

The current implementation
a) does not support nonzero non-repeaters field
b) builds the response in a manner that does not conform to
RFC3416#4.2.3 which results in complex client code
and sometimes retransmission of the same data.

Proposed implementation fixes both issues.

--

./lxnt

[PATCH] /usr/bin/sort posix patch

2009-12-20T21:03:28Z

The patch below adds support for sort's missing "-C" option (as per
POSIX:2008). This option behaves like "-c" except that it suppresses
output on STDERR.

Index: extern.h
===================================================================
RCS file: /usr/cvs/src/usr.bin/sort/extern.h,v
retrieving revision 1.7
diff -u -r1.7 extern.h
--- extern.h 26 Jun 2003 00:12:39 -0000 1.7
+++ extern.h 21 Dec 2009 04:36:24 -0000
@@ -61,7 +61,8 @@
int optval(int, int);
void order(union f_handle,
int (*)(int, union f_handle, int, RECHEADER *, u_char *, struct field *),
- struct field *);
+ struct field *,
+ int c_warn);
void putline(RECHEADER *, FILE *);
void putrec(RECHEADER *, FILE *);
void rd_append(int, union f_handle, int, FILE *, u_char *, u_char *);
Index: msort.c
===================================================================
RCS file: /usr/cvs/src/usr.bin/sort/msort.c,v
retrieving revision 1.22
diff -u -r1.22 msort.c
--- msort.c 27 Oct 2009 23:59:43 -0000 1.22
+++ msort.c 21 Dec 2009 04:48:43 -0000
@@ -232,7 +232,8 @@
void
order(union f_handle infile,
int (*get)(int, union f_handle, int, RECHEADER *, u_char *, struct field *),
- struct field *ftbl)
+ struct field *ftbl,
+ int c_warn)
{
u_char *crec_end, *prec_end, *trec_end;
int c;
@@ -256,13 +257,17 @@
while (get(-1, infile, 1, crec, crec_end, ftbl) == 0) {
if (0 < (c = cmp(prec, crec))) {
crec->data[crec->length-1] = 0;
- errx(1, "found disorder: %s",
- crec->data+crec->offset);
+ c_warn ?
+ errx(1, "found disorder: %s",
+ crec->data+crec->offset) :
+ exit(1);
}
if (UNIQUE && !c) {
crec->data[crec->length-1] = 0;
- errx(1, "found non-uniqueness: %s",
- crec->data+crec->offset);
+ c_warn ?
+ errx(1, "found non-uniqueness: %s",
+ crec->data+crec->offset) :
+ exit(1);
}
/* Swap pointers so that this record is on place
* pointed to by prec and new record is read to place
Index: sort.1
===================================================================
RCS file: /usr/cvs/src/usr.bin/sort/sort.1,v
retrieving revision 1.34
diff -u -r1.34 sort.1
--- sort.1 16 Aug 2009 09:41:08 -0000 1.34
+++ sort.1 21 Dec 2009 04:08:01 -0000
@@ -40,7 +40,7 @@
.Nd sort or merge text files
.Sh SYNOPSIS
.Nm sort
-.Op Fl bcdfHimnrsuz
+.Op Fl bCcdfHimnrsuz
.Sm off
.Op Fl k\ \& Ar field1 Op , Ar field2
.Sm on
@@ -74,6 +74,11 @@
.Fl c
produces no output, except the error messages on
.Em stderr .
+.It Fl C
+Same as
+.Fl c
+except that no error message is sent to
+.Em stderr .
.It Fl m
Merge only; the input files are assumed to be pre-sorted.
.It Fl o Ar output
@@ -96,7 +101,9 @@
Unique: suppress all but one in each set of lines having equal keys.
If used with the
.Fl c
-option, also check that there are no lines with duplicate keys.
+or
+.Fl C
+options, also check that there are no lines with duplicate keys.
.El
.Pp
The following options override the default ordering rules.
Index: sort.c
===================================================================
RCS file: /usr/cvs/src/usr.bin/sort/sort.c,v
retrieving revision 1.38
diff -u -r1.38 sort.c
--- sort.c 28 Oct 2009 20:41:39 -0000 1.38
+++ sort.c 21 Dec 2009 04:52:47 -0000
@@ -93,7 +93,7 @@
{
int (*get)(int, union f_handle, int, RECHEADER *, u_char *, struct field *);
int ch, i, stdinflag = 0, tmp = 0;
- char nfields = 0, cflag = 0, mflag = 0;
+ char nfields = 0, cflag = 0, c_warn = 0, mflag = 0;
char *outfile, *outpath = 0;
struct field *fldtab, *ftpos;
union f_handle filelist;
@@ -111,7 +111,7 @@
fixit(&argc, argv);
if (!issetugid() && (outfile = getenv("TMPDIR")))
tmpdir = outfile;
- while ((ch = getopt(argc, argv, "bcdfik:mHno:rR:t:T:uy:zs")) != -1) {
+ while ((ch = getopt(argc, argv, "bCcdfik:mHno:rR:t:T:uy:zs")) != -1) {
switch (ch) {
case 'b': fldtab->flags |= BI | BT;
break;
@@ -159,8 +159,13 @@
case 'u':
UNIQUE = 1;
break;
+ case 'C':
+ cflag = 1;
+ c_warn = 0;
+ break;
case 'c':
cflag = 1;
+ c_warn = 1;
break;
case 'm':
mflag = 1;
@@ -188,7 +193,7 @@
}

if (cflag && argc > optind+1)
- errx(2, "too many input files for -c option");
+ errx(2, "too many input files for the -c or -C options");

if (argc - 2 > optind && !strcmp(argv[argc-2], "-o")) {
outpath = argv[argc-1];
@@ -249,7 +254,7 @@
}

if (cflag) {
- order(filelist, get, fldtab);
+ order(filelist, get, fldtab, c_warn);
/* NOT REACHED */
}

@@ -332,7 +337,7 @@

if (msg != NULL)
warnx("%s", msg);
- (void)fprintf(stderr, "usage: %s [-bcdfHimnrsuz] "
+ (void)fprintf(stderr, "usage: %s [-bCcdfHimnrsuz] "
"[-k field1[,field2]] [-o output] [-R char]\n"
"\t[-T dir] [-t char] [file ...]\n", __progname);
exit(2);

Re: [PATCH] /usr/bin/find posix patch

2009-12-20T08:19:12Z

Hi Daniel,

Daniel Dickman wrote on Sat, Dec 19, 2009 at 07:53:53PM -0500:

> I think something like the following might be needed for 'find' to adhere
> to posix a little more closely. The posix spec says that if the mutually
> exclusive -H and -L options are both specified, the last one specified
> should override the others.

Thank you, i just committed your patch to find/main.c.
I updated the manual in a different way, though.

Yours,
Ingo

[PATCH] /usr/bin/find posix patch

2009-12-19T16:53:53Z

I think something like the following might be needed for 'find' to adhere
to posix a little more closely. The posix spec says that if the mutually
exclusive -H and -L options are both specified, the last one specified
should override the others.

Index: find.1
===================================================================
RCS file: /usr/cvs/src/usr.bin/find/find.1,v
retrieving revision 1.74
diff -u -r1.74 find.1
--- find.1 9 Apr 2009 14:30:39 -0000 1.74
+++ find.1 19 Dec 2009 21:48:05 -0000
@@ -138,6 +138,13 @@
.Nm
from descending into directories that have a device number different
than that of the file from which the descent began.
+.Pp
+It is not an error to specify more than one of
+the following mutually exclusive options:
+.Fl H ,
+.Fl L .
+Where more than one of these options is specified,
+the last option given overrides the others.
.El
.Sh PRIMARIES
.Bl -tag -width Ds
Index: main.c
===================================================================
RCS file: /usr/cvs/src/usr.bin/find/main.c,v
retrieving revision 1.25
diff -u -r1.25 main.c
--- main.c 9 Dec 2009 13:59:43 -0000 1.25
+++ main.c 19 Dec 2009 22:20:25 -0000
@@ -75,6 +75,8 @@
switch(ch) {
case 'H':
ftsoptions |= FTS_COMFOLLOW;
+ ftsoptions |= FTS_PHYSICAL;
+ ftsoptions &= ~FTS_LOGICAL;
break;
case 'd':
isdepth = 1;
@@ -84,6 +86,7 @@
break;
case 'h':
case 'L':
+ ftsoptions &= ~FTS_COMFOLLOW;
ftsoptions &= ~FTS_PHYSICAL;
ftsoptions |= FTS_LOGICAL;
break;

Re: snmpd: better support for GETBULK

2009-12-19T15:08:04Z

Could you add few sentences explaining how is it better?

On Fri, Dec 18, 2009 at 03:32:32PM +0300, Alexander Sabourenkov wrote:

> Index: snmpd.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/snmpd/snmpd.h,v
> retrieving revision 1.25
> diff -u snmpd.h
> --- snmpd.h 6 Jun 2009 18:38:01 -0000 1.25
> +++ snmpd.h 18 Dec 2009 12:10:17 -0000
> @@ -209,9 +209,9 @@
> long long sm_request;
>
> long long sm_error;
> -#define sm_nonrepeaters sm_error
> long long sm_errorindex;
> -#define sm_maxrepetitions sm_errorindex
> + long long sm_nonrepeaters;
> + long long sm_maxrepetitions;
>
> struct ber_element *sm_pdu;
> struct ber_element *sm_pduend;
> Index: snmpe.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/snmpd/snmpe.c,v
> retrieving revision 1.24
> diff -u snmpe.c
> @@ -477,19 +479,95 @@
> return (BER_TYPE_OCTETSTRING);
> }
>
> +static struct ber_element *
> +snmpe_br_maxreps(struct snmp_message *msg, struct ber_element *start_elm,
> + struct ber_oid *start_oid, int len)
> +{
> + char buf[BUFSIZ];
> + struct ber_element *a, *b, *c, *d, *first, *last;
> + struct ber_oid oids[SNMPD_MAXVARBINDLEN];
> + int repnum, vb_count, vb_idx = 0;
> +
> + msg->sm_errorindex = len;
> + log_debug("snmpe_br_maxreps: maxreps=%d", msg->sm_maxrepetitions);
> +
> + /* stuff in the first oid we have already */
> + bcopy(start_oid, oids, sizeof(*start_oid));
> + log_debug("snmpe_br_maxreps: varbind %d, oid %s", vb_idx,
> + smi_oidstring(start_oid, buf, sizeof(buf)));
> +
> + vb_idx = 1;
> + a = start_elm;
> +
> + /* build a list of oids to iterate over */
> + while ((a != NULL) && (a->be_type != BER_TYPE_EOC)) {
> + msg->sm_errorindex ++;
> + a = a->be_next;
> +
> + if (a->be_class != BER_CLASS_UNIVERSAL ||
> + a->be_type != BER_TYPE_SEQUENCE)
> + continue;
> + if ((b = a->be_sub) == NULL)
> + continue;
> + if (ber_get_oid(b, &(oids[vb_idx])) != 0)
> + return NULL;
> + if (oids[vb_idx].bo_n < BER_MIN_OID_LEN ||
> + oids[vb_idx].bo_n > BER_MAX_OID_LEN)
> + return NULL;
> +
> + log_debug("snmpe_br_maxreps: varbind %d, oid %s", vb_idx,
> + smi_oidstring(&(oids[vb_idx]), buf, sizeof(buf)));
> + vb_idx ++;
> + }
> + vb_count = vb_idx;
> + log_debug("snmpe_br_maxreps: %d varbinds.", vb_count);
> +
> + msg->sm_errorindex = 0;
> + msg->sm_error = SNMP_ERROR_NONE;
> +
> + first = last = NULL;
> +
> + for (repnum = 0; repnum < msg->sm_maxrepetitions; repnum++) {
> + for(vb_idx=0; vb_idx<vb_count; vb_idx++) {
> + log_debug("snmpe_br_maxreps: varbind %d, repnum %d oid %s", vb_idx, repnum,
> + smi_oidstring(&(oids[vb_idx]), buf, sizeof(buf)));
> +
> + if (oids[vb_idx].bo_n == 0)
> + continue;
> + c = ber_add_sequence(NULL);
> + d = mps_getnextreq(c, &(oids[vb_idx]));
> + if (d == NULL) {
> + oids[vb_idx].bo_n = 0;
> + continue;
> + }
> + len += ber_calc_len(c);
> + if (len > SNMPD_MAXVARBINDLEN) {
> + log_debug("len > SNMPD_MAXVARBINDLEN: %d>%d", len, SNMPD_MAXVARBINDLEN);
> + ber_free_elements(c);
> + return first;
> + }
> + if (first == NULL)
> + first = c;
> + else
> + last->be_next = c;
> + last = c;
> + }
> + }
> + return first;
> +}
> +
> int
> snmpe_parse(struct sockaddr_storage *ss,
> struct ber_element *root, struct snmp_message *msg)
> {
> struct snmp_stats *stats = &env->sc_stats;
> - struct ber_element *a, *b, *c, *d, *e, *f, *next, *last;
> + struct ber_element *a, *b, *c, *d, *next, *last;
> const char *errstr = "invalid message";
> long long ver, req;
> unsigned long type, errval, erridx;
> - u_int class, state, i = 0, j = 0;
> + u_int class, state, i = 0;
> char *comn, buf[BUFSIZ], host[MAXHOSTNAMELEN];
> struct ber_oid o;
> - size_t len;
>
> bzero(msg, sizeof(*msg));
>
> @@ -591,6 +671,8 @@
> msg->sm_request = req;
> msg->sm_error = errval;
> msg->sm_errorindex = erridx;
> + msg->sm_nonrepeaters = msg->sm_error;
> + msg->sm_maxrepetitions = msg->sm_errorindex;
>
> print_host(ss, host, sizeof(host));
> log_debug("snmpe_parse: %s: SNMPv%d '%s' context %d request %lld",
> @@ -599,7 +681,7 @@
>
> errstr = "invalid varbind element";
> for (i = 1, a = msg->sm_varbind, last = NULL;
> - a != NULL && i < SNMPD_MAXVARBIND; a = next, i++) {
> + a != NULL && i < SNMPD_MAXVARBINDLEN; a = next, i++) {
> next = a->be_next;
>
> if (a->be_class != BER_CLASS_UNIVERSAL ||
> @@ -647,30 +729,28 @@
> msg->sm_error = SNMP_ERROR_READONLY;
> goto varfail;
> case SNMP_C_GETBULKREQ:
> - j = msg->sm_maxrepetitions;
> + msg->sm_error = 0;
> msg->sm_errorindex = 0;
> - msg->sm_error = SNMP_ERROR_NOSUCHNAME;
> - for (d = NULL, len = 0; j > 0; j--) {
> - e = ber_add_sequence(NULL);
> - if (c == NULL)
> - c = e;
> - f = mps_getnextreq(e, &o);
> - if (f == NULL) {
> - ber_free_elements(e);
> - if (d == NULL)
> - goto varfail;
> + if (msg->sm_nonrepeaters) {
> + log_debug("handling %dth nonrepeater %s",
> + msg->sm_nonrepeaters, smi_oidstring(&o, buf, sizeof(buf)));
> + msg->sm_nonrepeaters--;
> + c = ber_add_sequence(NULL);
> + if ((d = mps_getnextreq(c, &o)) != NULL)
> break;
> - }
> - len += ber_calc_len(e);
> - if (len > SNMPD_MAXVARBINDLEN) {
> - ber_free_elements(e);
> - break;
> - }
> - if (d != NULL)
> - ber_link_elements(d, e);
> - d = e;
> + ber_free_elements(c);
> + c = NULL;
> + break; /* ignore error */
> }
> - msg->sm_error = 0;
> + if (msg->sm_maxrepetitions == 0) {
> + log_debug("error: no nonreps, no maxreps, oid not expected: %s",
> + smi_oidstring(&o, buf, sizeof(buf)));
> + msg->sm_error = SNMP_ERROR_GENERR;
> + goto varfail;
> + }
> + c = snmpe_br_maxreps(msg, a, &o, i);
> + state = 42; /* break inner loop */
> + i = state * SNMPD_MAXVARBINDLEN; /* break outer loop */
> break;
> default:
> goto varfail;

Re: snmpd: do not touch uninitialized memory

2009-12-19T15:05:34Z

On Fri, Dec 18, 2009 at 03:26:14PM +0300, Alexander Sabourenkov wrote:
> Dumping string-type data would spew contents of uninitialized memory
> because ber_get_string does no effort to zero-terminate its result.

Please submit diffs that apply to -current.

I admit ignorance of SNMP internals but by inspecting the code I
am not convinced this is the right fix. Before working around
missing NUL terminator it must become clear why is it missing in
the first place.

Look at buf_read_element. The BER_TYPE_OCTETSTRING is always
NUL-terminated. Why is the terminator missing few lines later?

Then look at mps_setstr. It strdups BER_TYPE_OCTETSTRING. If NUL
was always missing, then use of strdup would be incorrect. Is it?

Jacek

> Index: snmpe.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/snmpd/snmpe.c,v
> retrieving revision 1.25
> diff -u snmpe.c
> --- snmpe.c 16 Dec 2009 22:17:53 -0000 1.25
> +++ snmpe.c 18 Dec 2009 12:15:24 -0000
> @@ -433,9 +433,11 @@
> root->be_type == SNMP_T_IPADDR) {
> fprintf(stderr, "addr %s\n",
> inet_ntoa(*(struct in_addr *)buf));
> - } else
> - fprintf(stderr, "string \"%s\"\n",
> - root->be_len ? buf : "");
> + } else {
> + fwrite("string \"", 8, 1, stderr);
> + fwrite(buf, root->be_len, 1, stderr);
> + fwrite("\"\n", 2, 1, stderr);
> + }
> break;
> case BER_TYPE_NULL: /* no payload */
> case BER_TYPE_EOC:
>
> --
>
> ./lxnt

Re: ifconfig(8) diff: one strdup less in trunk_status()

2009-12-19T11:36:24Z

On Sat, Dec 19, 2009 at 09:16:06PM +0200, Vladimir Kirillov wrote:
> Hello tech@!
>
> Not sure this strdup() is required just to print the actor_mac.
> Should it be removed?

No. Please read the ether_ntoa manpage:
"It returns a pointer to a static structure that is reused for each call."
In other words you can not call ether_ntoa() twice in a printf().

>
> Index: ifconfig.c
> ===================================================================
> RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
> retrieving revision 1.226
> diff -u -p -r1.226 ifconfig.c
> --- ifconfig.c 14 Dec 2009 17:22:58 -0000 1.226
> +++ ifconfig.c 19 Dec 2009 19:15:15 -0000
> @@ -4360,21 +4360,16 @@ trunk_status(void)
> if (isport)
> printf(" trunkdev %s", rp.rp_ifname);
> putchar('\n');
> - if (ra.ra_proto == TRUNK_PROTO_LACP) {
> - char *act_mac = strdup(
> - ether_ntoa((struct ether_addr*)lp->actor_mac));
> - if (act_mac == NULL)
> - err(1, "strdup");
> + if (ra.ra_proto == TRUNK_PROTO_LACP)
> printf("\ttrunk id: [(%04X,%s,%04X,%04X,%04X),\n"
> "\t\t (%04X,%s,%04X,%04X,%04X)]\n",
> - lp->actor_prio, act_mac,
> + lp->actor_prio,
> + ether_ntoa((struct ether_addr *)lp->actor_mac),
> lp->actor_key, lp->actor_portprio, lp->actor_portno,
> lp->partner_prio,
> ether_ntoa((struct ether_addr*)lp->partner_mac),
> lp->partner_key, lp->partner_portprio,
> lp->partner_portno);
> - free(act_mac);
> - }
>
> for (i = 0; i < ra.ra_ports; i++) {
> printf("\t\ttrunkport %s ", rpbuf[i].rp_portname);
>

--
:wq Claudio

ifconfig(8) diff: one strdup less in trunk_status()

2009-12-19T11:16:06Z

Hello tech@!

Not sure this strdup() is required just to print the actor_mac.
Should it be removed?

Index: ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.226
diff -u -p -r1.226 ifconfig.c
--- ifconfig.c 14 Dec 2009 17:22:58 -0000 1.226
+++ ifconfig.c 19 Dec 2009 19:15:15 -0000
@@ -4360,21 +4360,16 @@ trunk_status(void)
if (isport)
printf(" trunkdev %s", rp.rp_ifname);
putchar('\n');
- if (ra.ra_proto == TRUNK_PROTO_LACP) {
- char *act_mac = strdup(
- ether_ntoa((struct ether_addr*)lp->actor_mac));
- if (act_mac == NULL)
- err(1, "strdup");
+ if (ra.ra_proto == TRUNK_PROTO_LACP)
printf("\ttrunk id: [(%04X,%s,%04X,%04X,%04X),\n"
"\t\t (%04X,%s,%04X,%04X,%04X)]\n",
- lp->actor_prio, act_mac,
+ lp->actor_prio,
+ ether_ntoa((struct ether_addr *)lp->actor_mac),
lp->actor_key, lp->actor_portprio, lp->actor_portno,
lp->partner_prio,
ether_ntoa((struct ether_addr*)lp->partner_mac),
lp->partner_key, lp->partner_portprio,
lp->partner_portno);
- free(act_mac);
- }

for (i = 0; i < ra.ra_ports; i++) {
printf("\t\ttrunkport %s ", rpbuf[i].rp_portname);

Re: macro name -- ypldap.conf.5

2009-12-19T08:21:28Z

On Mon, Dec 14, 2009 at 09:49:45AM +0100, Rogier Krieger wrote:
> >From what I can tell (and verify via ypldap -n), 'cost' is a valid
> macro name. I suspect it was missed when copying text bits from
> ripd.conf.5. Only a nit. Diff included below.
>

fixed, thanks.
jmc

>
> Index: ypldap/ypldap.conf.5
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ypldap/ypldap.conf.5,v
> retrieving revision 1.13
> diff -u -r1.13 ypldap.conf.5
> --- ypldap/ypldap.conf.5 16 Feb 2009 08:27:20 -0000 1.13
> +++ ypldap/ypldap.conf.5 14 Dec 2009 08:43:56 -0000
> @@ -47,7 +47,7 @@
> Macro names must start with a letter, and may contain letters, digits,
> and underscores.
> Macro names may not be reserved words (for example,
> -.Ic cost ) .
> +.Ic domain ) .
> Macros are not expanded inside quotes.
> .Pp
> For example:

Re: ifconfig(8) diff to properly resolve netmasks

2009-12-19T07:37:41Z

forgot the case to avoid
# ifconfig vether0 netmask google.com

Index: ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.226
diff -u -p -r1.226 ifconfig.c
--- ifconfig.c 14 Dec 2009 17:22:58 -0000 1.226
+++ ifconfig.c 19 Dec 2009 15:36:56 -0000
@@ -4438,10 +4438,10 @@ in_getaddr(const char *s, int which)
in_getprefix(p, MASK);
memcpy(&sin->sin_addr, &tsin.sin_addr, sizeof(sin->sin_addr));
} else if (inet_aton(s, &sin->sin_addr) == 0) {
- if ((hp = gethostbyname(s)))
- memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
- else if ((np = getnetbyname(s)))
+ if (which == MASK && (np = getnetbyname(s)))
sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
+ else if (which != MASK && (hp = gethostbyname2(s, AF_INET)))
+ memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
else
errx(1, "%s: bad value", s);
}

ifconfig(8) diff to properly resolve netmasks

2009-12-19T07:02:47Z

Hello tech@!

This diff prevents setting bogus netmasks, which are retrieved via
gethostbyname()

i.e.:

root ~ 0 # grep mynet /etc/networks
mynet 255.255.0.0
root ~ 0 # ifconfig vether0 inet 10.0.0.100 netmask mynet
root ~ 0 # ifconfig vether0
vether0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
lladdr 00:bd:2d:ce:3f:01
priority: 0
groups: vether
media: Ethernet autoselect
status: active
inet 10.0.0.100 netmask 0x43d74184 broadcast 190.40.190.127

now:

root src/sbin/ifconfig 0 # obj/ifconfig vether0 inet 10.0.0.100 netmask mynet
root src/sbin/ifconfig 0 # obj/ifconfig vether0
vether0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
lladdr 00:bd:2d:ce:3f:01
priority: 0
groups: vether
media: Ethernet autoselect
status: active
inet 10.0.0.100 netmask 0xffff0000 broadcast 10.0.255.255

Index: ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.226
diff -u -p -r1.226 ifconfig.c
--- ifconfig.c 14 Dec 2009 17:22:58 -0000 1.226
+++ ifconfig.c 19 Dec 2009 13:39:51 -0000
@@ -4438,10 +4438,10 @@ in_getaddr(const char *s, int which)
in_getprefix(p, MASK);
memcpy(&sin->sin_addr, &tsin.sin_addr, sizeof(sin->sin_addr));
} else if (inet_aton(s, &sin->sin_addr) == 0) {
- if ((hp = gethostbyname(s)))
- memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
- else if ((np = getnetbyname(s)))
+ if (which == MASK && (np = getnetbyname(s)))
sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
+ else if ((hp = gethostbyname2(s, AF_INET)))
+ memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
else
errx(1, "%s: bad value", s);
}