PERFORCE change 107149 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=107149

Change 107149 by rwatson at rwatson_peppercorn on 2006/10/03 08:29:45

	Not very correct version ifdef'ing for priv(9) in 6.x.

Affected files ...

.. //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 (text) ====

@@ -1342,7 +1342,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1383,7 +1383,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1413,7 +1413,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1433,7 +1433,7 @@
 		CE_DEBUG2 (d, ("ioctl: setcfg\n"));
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1535,7 +1535,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1571,7 +1571,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1599,7 +1599,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1623,7 +1623,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1651,7 +1651,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1677,7 +1677,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1707,7 +1707,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1731,7 +1731,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1759,7 +1759,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1785,7 +1785,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1813,7 +1813,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1841,7 +1841,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1869,7 +1869,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1902,7 +1902,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1929,7 +1929,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1948,7 +1948,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);
@@ -1986,7 +1986,7 @@
 		/* Only for superuser! */
 #if __FreeBSD_version < 500000
 		error = suser (p);
-#elsif __FreeBSD_version < 700000
+#elsif __FreeBSD_version < 600000
 		error = suser (td);
 #else
 		error = priv_check (td, PRIV_DRIVER);