Attachment 232902 Details for Bug 263011 – place warning later

[patch] place warning later

mountd-patch (text/plain), 1.30 KB, created by Peter Much on 2022-04-02 18:50:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Much

Created: 2022-04-02 18:50:42 UTC

Size: 1.30 KB

patch

obsolete

>--- mountd.c.orig	2022-04-01 08:24:18.422141000 +0200
>+++ mountd.c	2022-04-02 20:46:10.926525000 +0200
>@@ -319,6 +319,7 @@
> #define	OP_QUIET	0x100
> #define OP_MASKLEN	0x200
> #define OP_SEC		0x400
>+#define OP_CLASSMASK	0x800
> 
> #ifdef DEBUG
> static int debug = 1;
>@@ -1749,6 +1750,11 @@
> 			nextfield(&cp, &endcp);
> 			len = endcp - cp;
> 		}
>+		if(opt_flags & OP_CLASSMASK)
>+			syslog(LOG_WARNING,
>+			    "WARNING: No mask specified for %s, "
>+			    "using out-of-date default",
>+			    (&grp->gr_ptr.gt_net)->nt_name);
> 		if (check_options(dirhead)) {
> 			getexp_err(ep, tgrp, NULL);
> 			goto nextline;
>@@ -3385,6 +3391,7 @@
> 			goto fail;
> 		bcopy(sa, &net->nt_mask, sa->sa_len);
> 		opt_flags |= OP_HAVEMASK;
>+		opt_flags &= ~OP_CLASSMASK;
> 	} else {
> 		/* The specified sockaddr is a network address. */
> 		bcopy(sa, &net->nt_net, sa->sa_len);
>@@ -3418,9 +3425,6 @@
> 		    (opt_flags & OP_MASK) == 0) {
> 			in_addr_t addr;
> 
>-			syslog(LOG_WARNING,
>-			    "WARNING: No mask specified for %s, "
>-			    "using out-of-date default", name);
> 			addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
> 			if (IN_CLASSA(addr))
> 				preflen = 8;
>@@ -3435,7 +3439,7 @@
> 
> 			bcopy(sa, &net->nt_mask, sa->sa_len);
> 			makemask(&net->nt_mask, (int)preflen);
>-			opt_flags |= OP_HAVEMASK;
>+			opt_flags |= OP_HAVEMASK|OP_CLASSMASK;
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 263011: 232902