about summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/arpa/ftp.h4
-rw-r--r--inet/arpa/telnet.h4
-rw-r--r--inet/arpa/tftp.h4
-rw-r--r--inet/inet_lnaof.c4
-rw-r--r--inet/inet_mkadr.c4
-rw-r--r--inet/inet_net.c4
-rw-r--r--inet/inet_netof.c4
-rw-r--r--inet/protocols/routed.h6
-rw-r--r--inet/protocols/rwhod.h4
-rw-r--r--inet/protocols/talkd.h4
-rw-r--r--inet/protocols/timed.h12
-rw-r--r--inet/rcmd.c4
-rw-r--r--inet/rexec.c4
-rw-r--r--inet/ruserpass.c4
14 files changed, 5 insertions, 61 deletions
diff --git a/inet/arpa/ftp.h b/inet/arpa/ftp.h
index ac864aa708..e5b340db12 100644
--- a/inet/arpa/ftp.h
+++ b/inet/arpa/ftp.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/arpa/telnet.h b/inet/arpa/telnet.h
index 3309e5d727..3774c89285 100644
--- a/inet/arpa/telnet.h
+++ b/inet/arpa/telnet.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/arpa/tftp.h b/inet/arpa/tftp.h
index 15bfc656c2..03ed54f678 100644
--- a/inet/arpa/tftp.h
+++ b/inet/arpa/tftp.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/inet_lnaof.c b/inet/inet_lnaof.c
index cd5ef29c5d..7e934642fd 100644
--- a/inet/inet_lnaof.c
+++ b/inet/inet_lnaof.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/inet_mkadr.c b/inet/inet_mkadr.c
index 7f260744e9..f076cf5e03 100644
--- a/inet/inet_mkadr.c
+++ b/inet/inet_mkadr.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/inet_net.c b/inet/inet_net.c
index 54120cb279..532d8211ea 100644
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/inet_netof.c b/inet/inet_netof.c
index 40cbc0ea97..ab06a54b2d 100644
--- a/inet/inet_netof.c
+++ b/inet/inet_netof.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/protocols/routed.h b/inet/protocols/routed.h
index 503da847a0..befd8654d7 100644
--- a/inet/protocols/routed.h
+++ b/inet/protocols/routed.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -62,7 +58,7 @@ struct rip {
 #define	rip_nets	ripun.ru_nets
 #define	rip_tracefile	ripun.ru_tracefile
 };
- 
+
 /*
  * Packet types.
  */
diff --git a/inet/protocols/rwhod.h b/inet/protocols/rwhod.h
index 392d1fc557..446d6f97b8 100644
--- a/inet/protocols/rwhod.h
+++ b/inet/protocols/rwhod.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h
index fa22b43bda..a8f33b1bab 100644
--- a/inet/protocols/talkd.h
+++ b/inet/protocols/talkd.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
index dc880ab325..4345bed476 100644
--- a/inet/protocols/timed.h
+++ b/inet/protocols/timed.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -58,14 +54,14 @@ struct tsp {
 
 #define	tsp_time	tsp_u.tspu_time
 #define	tsp_hopcnt	tsp_u.tspu_hopcnt
- 
+
 /*
  * Command types.
  */
 #define	TSP_ANY			0	/* match any types */
 #define	TSP_ADJTIME		1	/* send adjtime */
 #define	TSP_ACK			2	/* generic acknowledgement */
-#define	TSP_MASTERREQ		3	/* ask for master's name */ 
+#define	TSP_MASTERREQ		3	/* ask for master's name */
 #define	TSP_MASTERACK		4	/* acknowledge master request */
 #define	TSP_SETTIME		5	/* send network time */
 #define	TSP_MASTERUP		6	/* inform slaves that master is up */
@@ -92,8 +88,8 @@ struct tsp {
 
 #ifdef TSPTYPES
 char *tsptype[TSPTYPENUMBER] =
-  { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP", 
-  "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT", 
+  { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
+  "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
   "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 #endif
diff --git a/inet/rcmd.c b/inet/rcmd.c
index d8524f93c8..1a38de555d 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/rexec.c b/inet/rexec.c
index 8f329b575c..4032c82170 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index 2673fc5bf4..582eec6613 100644
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.