Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.224.2.5
retrieving revision 1.225
diff -u -p -r1.224.2.5 -r1.225
--- src/sys/netinet/ip_input.c	2006/09/14 12:31:55	1.224.2.5
+++ src/sys/netinet/ip_input.c	2006/04/15 02:24:12	1.225
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.224.2.5 2006/09/14 12:31:55 yamt Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.225 2006/04/15 02:24:12 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.224.2.5 2006/09/14 12:31:55 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.225 2006/04/15 02:24:12 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -121,7 +121,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/sysctl.h>
-#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -415,7 +414,7 @@ ip_init(void)
 	for (i = 0; i < IPREASS_NHASH; i++)
 	    	LIST_INIT(&ipq[i]);
 
-	ip_id = time_second & 0xfffff;
+	ip_id = time.tv_sec & 0xfffff;
 
 	ipintrq.ifq_maxlen = ipqmaxlen;
 	ip_nmbclusters_changed();
@@ -446,10 +445,7 @@ ip_init(void)
 #endif /* MBUFTRACE */
 }
 
-struct	sockaddr_in ipaddr = {
-	.sin_len = sizeof(ipaddr),
-	.sin_family = AF_INET,
-};
+struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
 struct	route ipforward_rt;
 
 /*
@@ -978,7 +974,7 @@ found:
 		goto bad;
 	}
 #endif
-#ifdef FAST_IPSEC
+#if FAST_IPSEC
 	/*
 	 * enforce IPsec policy checking if we are seeing last header.
 	 * note that we do not visit this with protocols with pcb layer
@@ -2097,31 +2093,6 @@ ip_savecontrol(struct inpcb *inp, struct
 }
 
 /*
- * sysctl helper routine for net.inet.ip.forwsrcrt.
- */
-static int
-sysctl_net_inet_ip_forwsrcrt(SYSCTLFN_ARGS)
-{
-	int error, tmp;
-	struct sysctlnode node;
-
-	node = *rnode;
-	tmp = ip_forwsrcrt;
-	node.sysctl_data = &tmp;
-	error = sysctl_lookup(SYSCTLFN_CALL(&node));
-	if (error || newp == NULL)
-		return (error);
-
-	if (kauth_authorize_network(l->l_cred, KAUTH_NETWORK_FORWSRCRT,
-	    NULL, NULL, NULL, NULL))
-		return (EPERM);
-
-	ip_forwsrcrt = tmp;
-
-	return (0);
-}
-
-/*
  * sysctl helper routine for net.inet.ip.mtudisctimeout.  checks the
  * range of the new value and tweaks timers if it changes.
  */
@@ -2222,11 +2193,11 @@ SYSCTL_SETUP(sysctl_net_inet_ip_setup, "
 		       IPCTL_DEFMTU, CTL_EOL);
 #endif /* IPCTL_DEFMTU */
 	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		       CTLFLAG_PERMANENT|CTLFLAG_READONLY1,
 		       CTLTYPE_INT, "forwsrcrt",
 		       SYSCTL_DESCR("Enable forwarding of source-routed "
 				    "datagrams"),
-		       sysctl_net_inet_ip_forwsrcrt, 0, &ip_forwsrcrt, 0,
+		       NULL, 0, &ip_forwsrcrt, 0,
 		       CTL_NET, PF_INET, IPPROTO_IP,
 		       IPCTL_FORWSRCRT, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,