Remove trailing whitespace.

12 files changed, 423 insertions, 423 deletions

diff --git a/gnu/usr.sbin/isdn/alaw2ulaw/con.h b/gnu/usr.sbin/isdn/alaw2ulaw/con.h
index def02c5..9f359c8 100644
--- a/gnu/usr.sbin/isdn/alaw2ulaw/con.h
+++ b/gnu/usr.sbin/isdn/alaw2ulaw/con.h
@@ -1,107 +1,107 @@
 
 static unsigned char ulaw_linear[] = {
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    2, 
-     5,    9,   13,   17,   21,   25,   29,   33, 
-    37,   41,   45,   49,   53,   57,   61,   65, 
-    68,   70,   72,   74,   76,   78,   80,   82, 
-    84,   86,   88,   90,   92,   94,   96,   98, 
-   100,  101,  102,  103,  104,  105,  106,  107, 
-   108,  109,  110,  111,  112,  113,  114,  115, 
-   115,  116,  116,  117,  117,  118,  118,  119, 
-   119,  120,  120,  121,  121,  122,  122,  123, 
-   123,  123,  124,  124,  124,  124,  125,  125, 
-   125,  125,  126,  126,  126,  126,  127,  127, 
-   127,  127,  127,  127,  128,  128,  128,  128, 
-   128,  128,  128,  128,  128,  128,  128,  128, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   252,  248,  244,  240,  236,  232,  228,  224, 
-   220,  216,  212,  208,  204,  200,  196,  192, 
-   189,  187,  185,  183,  181,  179,  177,  175, 
-   173,  171,  169,  167,  165,  163,  161,  159, 
-   157,  156,  155,  154,  153,  152,  151,  150, 
-   149,  148,  147,  146,  145,  144,  143,  142, 
-   142,  141,  141,  140,  140,  139,  139,  138, 
-   138,  137,  137,  136,  136,  135,  135,  134, 
-   134,  134,  133,  133,  133,  133,  132,  132, 
-   132,  132,  131,  131,  131,  131,  130,  130, 
-   130,  130,  130,  130,  129,  129,  129,  129, 
-   129,  129,  129,  129,  128,  128,  128,  128, 
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    2,
+     5,    9,   13,   17,   21,   25,   29,   33,
+    37,   41,   45,   49,   53,   57,   61,   65,
+    68,   70,   72,   74,   76,   78,   80,   82,
+    84,   86,   88,   90,   92,   94,   96,   98,
+   100,  101,  102,  103,  104,  105,  106,  107,
+   108,  109,  110,  111,  112,  113,  114,  115,
+   115,  116,  116,  117,  117,  118,  118,  119,
+   119,  120,  120,  121,  121,  122,  122,  123,
+   123,  123,  124,  124,  124,  124,  125,  125,
+   125,  125,  126,  126,  126,  126,  127,  127,
+   127,  127,  127,  127,  128,  128,  128,  128,
+   128,  128,  128,  128,  128,  128,  128,  128,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   252,  248,  244,  240,  236,  232,  228,  224,
+   220,  216,  212,  208,  204,  200,  196,  192,
+   189,  187,  185,  183,  181,  179,  177,  175,
+   173,  171,  169,  167,  165,  163,  161,  159,
+   157,  156,  155,  154,  153,  152,  151,  150,
+   149,  148,  147,  146,  145,  144,  143,  142,
+   142,  141,  141,  140,  140,  139,  139,  138,
+   138,  137,  137,  136,  136,  135,  135,  134,
+   134,  134,  133,  133,  133,  133,  132,  132,
+   132,  132,  131,  131,  131,  131,  130,  130,
+   130,  130,  130,  130,  129,  129,  129,  129,
+   129,  129,  129,  129,  128,  128,  128,  128,
 };
 
 static unsigned char linear_ulaw[] = {
-    31,   31,   31,   32,   32,   32,   32,   33, 
-    33,   33,   33,   34,   34,   34,   34,   35, 
-    35,   35,   35,   36,   36,   36,   36,   37, 
-    37,   37,   37,   38,   38,   38,   38,   39, 
-    39,   39,   39,   40,   40,   40,   40,   41, 
-    41,   41,   41,   42,   42,   42,   42,   43, 
-    43,   43,   43,   44,   44,   44,   44,   45, 
-    45,   45,   45,   46,   46,   46,   46,   47, 
-    47,   47,   47,   48,   48,   49,   49,   50, 
-    50,   51,   51,   52,   52,   53,   53,   54, 
-    54,   55,   55,   56,   56,   57,   57,   58, 
-    58,   59,   59,   60,   60,   61,   61,   62, 
-    62,   63,   63,   64,   65,   66,   67,   68, 
-    69,   70,   71,   72,   73,   74,   75,   76, 
-    77,   78,   79,   81,   83,   85,   87,   89, 
-    91,   93,   95,   99,  103,  107,  111,  119, 
-   255,  247,  239,  235,  231,  227,  223,  221, 
-   219,  217,  215,  213,  211,  209,  207,  206, 
-   205,  204,  203,  202,  201,  200,  199,  198, 
-   197,  196,  195,  194,  193,  192,  191,  191, 
-   190,  190,  189,  189,  188,  188,  187,  187, 
-   186,  186,  185,  185,  184,  184,  183,  183, 
-   182,  182,  181,  181,  180,  180,  179,  179, 
-   178,  178,  177,  177,  176,  176,  175,  175, 
-   175,  175,  174,  174,  174,  174,  173,  173, 
-   173,  173,  172,  172,  172,  172,  171,  171, 
-   171,  171,  170,  170,  170,  170,  169,  169, 
-   169,  169,  168,  168,  168,  168,  167,  167, 
-   167,  167,  166,  166,  166,  166,  165,  165, 
-   165,  165,  164,  164,  164,  164,  163,  163, 
-   163,  163,  162,  162,  162,  162,  161,  161, 
-   161,  161,  160,  160,  160,  160,  159,  159, 
+    31,   31,   31,   32,   32,   32,   32,   33,
+    33,   33,   33,   34,   34,   34,   34,   35,
+    35,   35,   35,   36,   36,   36,   36,   37,
+    37,   37,   37,   38,   38,   38,   38,   39,
+    39,   39,   39,   40,   40,   40,   40,   41,
+    41,   41,   41,   42,   42,   42,   42,   43,
+    43,   43,   43,   44,   44,   44,   44,   45,
+    45,   45,   45,   46,   46,   46,   46,   47,
+    47,   47,   47,   48,   48,   49,   49,   50,
+    50,   51,   51,   52,   52,   53,   53,   54,
+    54,   55,   55,   56,   56,   57,   57,   58,
+    58,   59,   59,   60,   60,   61,   61,   62,
+    62,   63,   63,   64,   65,   66,   67,   68,
+    69,   70,   71,   72,   73,   74,   75,   76,
+    77,   78,   79,   81,   83,   85,   87,   89,
+    91,   93,   95,   99,  103,  107,  111,  119,
+   255,  247,  239,  235,  231,  227,  223,  221,
+   219,  217,  215,  213,  211,  209,  207,  206,
+   205,  204,  203,  202,  201,  200,  199,  198,
+   197,  196,  195,  194,  193,  192,  191,  191,
+   190,  190,  189,  189,  188,  188,  187,  187,
+   186,  186,  185,  185,  184,  184,  183,  183,
+   182,  182,  181,  181,  180,  180,  179,  179,
+   178,  178,  177,  177,  176,  176,  175,  175,
+   175,  175,  174,  174,  174,  174,  173,  173,
+   173,  173,  172,  172,  172,  172,  171,  171,
+   171,  171,  170,  170,  170,  170,  169,  169,
+   169,  169,  168,  168,  168,  168,  167,  167,
+   167,  167,  166,  166,  166,  166,  165,  165,
+   165,  165,  164,  164,  164,  164,  163,  163,
+   163,  163,  162,  162,  162,  162,  161,  161,
+   161,  161,  160,  160,  160,  160,  159,  159,
 };
 
 static unsigned char alaw_linear[] = {
-	45, 	214, 	122, 	133, 	0, 		255, 	107, 	149, 
-	86, 	171, 	126, 	129, 	0, 		255, 	117, 	138, 
-	13, 	246, 	120, 	135, 	0, 		255, 	99, 	157, 
-	70, 	187, 	124, 	131, 	0, 		255, 	113, 	142, 
-	61, 	198, 	123, 	132,  	0, 		255, 	111, 	145, 
-	94, 	163, 	127, 	128, 	0, 		255, 	119, 	136, 
-	29, 	230, 	121, 	134, 	0, 		255, 	103, 	153, 
-	78, 	179, 	125, 	130, 	0, 		255, 	115, 	140, 
-	37, 	222, 	122, 	133, 	0, 		255, 	105, 	151, 
-	82, 	175, 	126, 	129, 	0, 		255, 	116, 	139, 
-	5, 	254, 	120, 	135, 	0, 		255, 	97, 	159, 
-	66, 	191, 	124, 	131, 	0, 		255, 	112,	143, 
-	53, 	206, 	123, 	132, 	0, 		255, 	109, 	147, 
-	90, 	167, 	127, 	128, 	0, 		255,	118, 	137, 
-	21, 	238, 	121, 	134, 	0, 		255, 	101,	155, 
-	74, 	183, 	125, 	130, 	0, 		255, 	114, 	141, 
-	49, 	210, 	123, 	133, 	0, 		255, 	108, 	148, 
-	88, 	169, 	127, 	129, 	0, 		255, 	118, 	138, 
-	17, 	242, 	121, 	135, 	0, 		255, 	100, 	156, 
-	72, 	185, 	125, 	131, 	0, 		255, 	114, 	142, 
-	64, 	194, 	124, 	132, 	0, 		255, 	112, 	144, 
-	96, 	161, 	128, 	128, 	1, 		255, 	120, 	136, 
-	33, 	226, 	122, 	134, 	0, 		255, 	104, 	152, 
-	80, 	177, 	126, 	130, 	0, 		255, 	116, 	140, 
-	41, 	218, 	122, 	133, 	0, 		255, 	106, 	150, 
-	84, 	173, 	126, 	129, 	0, 		255, 	117, 	139, 
-	9, 	250, 	120, 	135, 	0, 		255, 	98, 	158, 
-	68, 	189, 	124, 	131, 	0, 		255, 	113, 	143, 
-	57, 	202, 	123, 	132, 	0, 		255, 	110, 	146, 
-	92, 	165, 	127, 	128, 	0, 		255, 	119, 	137, 
-	25, 	234, 	121, 	134, 	0, 		255, 	102, 	154, 
-	76, 	181, 	125, 	130, 	0, 		255, 	115, 	141, 
+	45, 	214, 	122, 	133, 	0, 		255, 	107, 	149,
+	86, 	171, 	126, 	129, 	0, 		255, 	117, 	138,
+	13, 	246, 	120, 	135, 	0, 		255, 	99, 	157,
+	70, 	187, 	124, 	131, 	0, 		255, 	113, 	142,
+	61, 	198, 	123, 	132,  	0, 		255, 	111, 	145,
+	94, 	163, 	127, 	128, 	0, 		255, 	119, 	136,
+	29, 	230, 	121, 	134, 	0, 		255, 	103, 	153,
+	78, 	179, 	125, 	130, 	0, 		255, 	115, 	140,
+	37, 	222, 	122, 	133, 	0, 		255, 	105, 	151,
+	82, 	175, 	126, 	129, 	0, 		255, 	116, 	139,
+	5, 	254, 	120, 	135, 	0, 		255, 	97, 	159,
+	66, 	191, 	124, 	131, 	0, 		255, 	112,	143,
+	53, 	206, 	123, 	132, 	0, 		255, 	109, 	147,
+	90, 	167, 	127, 	128, 	0, 		255,	118, 	137,
+	21, 	238, 	121, 	134, 	0, 		255, 	101,	155,
+	74, 	183, 	125, 	130, 	0, 		255, 	114, 	141,
+	49, 	210, 	123, 	133, 	0, 		255, 	108, 	148,
+	88, 	169, 	127, 	129, 	0, 		255, 	118, 	138,
+	17, 	242, 	121, 	135, 	0, 		255, 	100, 	156,
+	72, 	185, 	125, 	131, 	0, 		255, 	114, 	142,
+	64, 	194, 	124, 	132, 	0, 		255, 	112, 	144,
+	96, 	161, 	128, 	128, 	1, 		255, 	120, 	136,
+	33, 	226, 	122, 	134, 	0, 		255, 	104, 	152,
+	80, 	177, 	126, 	130, 	0, 		255, 	116, 	140,
+	41, 	218, 	122, 	133, 	0, 		255, 	106, 	150,
+	84, 	173, 	126, 	129, 	0, 		255, 	117, 	139,
+	9, 	250, 	120, 	135, 	0, 		255, 	98, 	158,
+	68, 	189, 	124, 	131, 	0, 		255, 	113, 	143,
+	57, 	202, 	123, 	132, 	0, 		255, 	110, 	146,
+	92, 	165, 	127, 	128, 	0, 		255, 	119, 	137,
+	25, 	234, 	121, 	134, 	0, 		255, 	102, 	154,
+	76, 	181, 	125, 	130, 	0, 		255, 	115, 	141,
 
 };
 
diff --git a/gnu/usr.sbin/isdn/ulaw2alaw/con.h b/gnu/usr.sbin/isdn/ulaw2alaw/con.h
index def02c5..9f359c8 100644
--- a/gnu/usr.sbin/isdn/ulaw2alaw/con.h
+++ b/gnu/usr.sbin/isdn/ulaw2alaw/con.h
@@ -1,107 +1,107 @@
 
 static unsigned char ulaw_linear[] = {
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    0, 
-     0,    0,    0,    0,    0,    0,    0,    2, 
-     5,    9,   13,   17,   21,   25,   29,   33, 
-    37,   41,   45,   49,   53,   57,   61,   65, 
-    68,   70,   72,   74,   76,   78,   80,   82, 
-    84,   86,   88,   90,   92,   94,   96,   98, 
-   100,  101,  102,  103,  104,  105,  106,  107, 
-   108,  109,  110,  111,  112,  113,  114,  115, 
-   115,  116,  116,  117,  117,  118,  118,  119, 
-   119,  120,  120,  121,  121,  122,  122,  123, 
-   123,  123,  124,  124,  124,  124,  125,  125, 
-   125,  125,  126,  126,  126,  126,  127,  127, 
-   127,  127,  127,  127,  128,  128,  128,  128, 
-   128,  128,  128,  128,  128,  128,  128,  128, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   255,  255,  255,  255,  255,  255,  255,  255, 
-   252,  248,  244,  240,  236,  232,  228,  224, 
-   220,  216,  212,  208,  204,  200,  196,  192, 
-   189,  187,  185,  183,  181,  179,  177,  175, 
-   173,  171,  169,  167,  165,  163,  161,  159, 
-   157,  156,  155,  154,  153,  152,  151,  150, 
-   149,  148,  147,  146,  145,  144,  143,  142, 
-   142,  141,  141,  140,  140,  139,  139,  138, 
-   138,  137,  137,  136,  136,  135,  135,  134, 
-   134,  134,  133,  133,  133,  133,  132,  132, 
-   132,  132,  131,  131,  131,  131,  130,  130, 
-   130,  130,  130,  130,  129,  129,  129,  129, 
-   129,  129,  129,  129,  128,  128,  128,  128, 
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    2,
+     5,    9,   13,   17,   21,   25,   29,   33,
+    37,   41,   45,   49,   53,   57,   61,   65,
+    68,   70,   72,   74,   76,   78,   80,   82,
+    84,   86,   88,   90,   92,   94,   96,   98,
+   100,  101,  102,  103,  104,  105,  106,  107,
+   108,  109,  110,  111,  112,  113,  114,  115,
+   115,  116,  116,  117,  117,  118,  118,  119,
+   119,  120,  120,  121,  121,  122,  122,  123,
+   123,  123,  124,  124,  124,  124,  125,  125,
+   125,  125,  126,  126,  126,  126,  127,  127,
+   127,  127,  127,  127,  128,  128,  128,  128,
+   128,  128,  128,  128,  128,  128,  128,  128,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   255,  255,  255,  255,  255,  255,  255,  255,
+   252,  248,  244,  240,  236,  232,  228,  224,
+   220,  216,  212,  208,  204,  200,  196,  192,
+   189,  187,  185,  183,  181,  179,  177,  175,
+   173,  171,  169,  167,  165,  163,  161,  159,
+   157,  156,  155,  154,  153,  152,  151,  150,
+   149,  148,  147,  146,  145,  144,  143,  142,
+   142,  141,  141,  140,  140,  139,  139,  138,
+   138,  137,  137,  136,  136,  135,  135,  134,
+   134,  134,  133,  133,  133,  133,  132,  132,
+   132,  132,  131,  131,  131,  131,  130,  130,
+   130,  130,  130,  130,  129,  129,  129,  129,
+   129,  129,  129,  129,  128,  128,  128,  128,
 };
 
 static unsigned char linear_ulaw[] = {
-    31,   31,   31,   32,   32,   32,   32,   33, 
-    33,   33,   33,   34,   34,   34,   34,   35, 
-    35,   35,   35,   36,   36,   36,   36,   37, 
-    37,   37,   37,   38,   38,   38,   38,   39, 
-    39,   39,   39,   40,   40,   40,   40,   41, 
-    41,   41,   41,   42,   42,   42,   42,   43, 
-    43,   43,   43,   44,   44,   44,   44,   45, 
-    45,   45,   45,   46,   46,   46,   46,   47, 
-    47,   47,   47,   48,   48,   49,   49,   50, 
-    50,   51,   51,   52,   52,   53,   53,   54, 
-    54,   55,   55,   56,   56,   57,   57,   58, 
-    58,   59,   59,   60,   60,   61,   61,   62, 
-    62,   63,   63,   64,   65,   66,   67,   68, 
-    69,   70,   71,   72,   73,   74,   75,   76, 
-    77,   78,   79,   81,   83,   85,   87,   89, 
-    91,   93,   95,   99,  103,  107,  111,  119, 
-   255,  247,  239,  235,  231,  227,  223,  221, 
-   219,  217,  215,  213,  211,  209,  207,  206, 
-   205,  204,  203,  202,  201,  200,  199,  198, 
-   197,  196,  195,  194,  193,  192,  191,  191, 
-   190,  190,  189,  189,  188,  188,  187,  187, 
-   186,  186,  185,  185,  184,  184,  183,  183, 
-   182,  182,  181,  181,  180,  180,  179,  179, 
-   178,  178,  177,  177,  176,  176,  175,  175, 
-   175,  175,  174,  174,  174,  174,  173,  173, 
-   173,  173,  172,  172,  172,  172,  171,  171, 
-   171,  171,  170,  170,  170,  170,  169,  169, 
-   169,  169,  168,  168,  168,  168,  167,  167, 
-   167,  167,  166,  166,  166,  166,  165,  165, 
-   165,  165,  164,  164,  164,  164,  163,  163, 
-   163,  163,  162,  162,  162,  162,  161,  161, 
-   161,  161,  160,  160,  160,  160,  159,  159, 
+    31,   31,   31,   32,   32,   32,   32,   33,
+    33,   33,   33,   34,   34,   34,   34,   35,
+    35,   35,   35,   36,   36,   36,   36,   37,
+    37,   37,   37,   38,   38,   38,   38,   39,
+    39,   39,   39,   40,   40,   40,   40,   41,
+    41,   41,   41,   42,   42,   42,   42,   43,
+    43,   43,   43,   44,   44,   44,   44,   45,
+    45,   45,   45,   46,   46,   46,   46,   47,
+    47,   47,   47,   48,   48,   49,   49,   50,
+    50,   51,   51,   52,   52,   53,   53,   54,
+    54,   55,   55,   56,   56,   57,   57,   58,
+    58,   59,   59,   60,   60,   61,   61,   62,
+    62,   63,   63,   64,   65,   66,   67,   68,
+    69,   70,   71,   72,   73,   74,   75,   76,
+    77,   78,   79,   81,   83,   85,   87,   89,
+    91,   93,   95,   99,  103,  107,  111,  119,
+   255,  247,  239,  235,  231,  227,  223,  221,
+   219,  217,  215,  213,  211,  209,  207,  206,
+   205,  204,  203,  202,  201,  200,  199,  198,
+   197,  196,  195,  194,  193,  192,  191,  191,
+   190,  190,  189,  189,  188,  188,  187,  187,
+   186,  186,  185,  185,  184,  184,  183,  183,
+   182,  182,  181,  181,  180,  180,  179,  179,
+   178,  178,  177,  177,  176,  176,  175,  175,
+   175,  175,  174,  174,  174,  174,  173,  173,
+   173,  173,  172,  172,  172,  172,  171,  171,
+   171,  171,  170,  170,  170,  170,  169,  169,
+   169,  169,  168,  168,  168,  168,  167,  167,
+   167,  167,  166,  166,  166,  166,  165,  165,
+   165,  165,  164,  164,  164,  164,  163,  163,
+   163,  163,  162,  162,  162,  162,  161,  161,
+   161,  161,  160,  160,  160,  160,  159,  159,
 };
 
 static unsigned char alaw_linear[] = {
-	45, 	214, 	122, 	133, 	0, 		255, 	107, 	149, 
-	86, 	171, 	126, 	129, 	0, 		255, 	117, 	138, 
-	13, 	246, 	120, 	135, 	0, 		255, 	99, 	157, 
-	70, 	187, 	124, 	131, 	0, 		255, 	113, 	142, 
-	61, 	198, 	123, 	132,  	0, 		255, 	111, 	145, 
-	94, 	163, 	127, 	128, 	0, 		255, 	119, 	136, 
-	29, 	230, 	121, 	134, 	0, 		255, 	103, 	153, 
-	78, 	179, 	125, 	130, 	0, 		255, 	115, 	140, 
-	37, 	222, 	122, 	133, 	0, 		255, 	105, 	151, 
-	82, 	175, 	126, 	129, 	0, 		255, 	116, 	139, 
-	5, 	254, 	120, 	135, 	0, 		255, 	97, 	159, 
-	66, 	191, 	124, 	131, 	0, 		255, 	112,	143, 
-	53, 	206, 	123, 	132, 	0, 		255, 	109, 	147, 
-	90, 	167, 	127, 	128, 	0, 		255,	118, 	137, 
-	21, 	238, 	121, 	134, 	0, 		255, 	101,	155, 
-	74, 	183, 	125, 	130, 	0, 		255, 	114, 	141, 
-	49, 	210, 	123, 	133, 	0, 		255, 	108, 	148, 
-	88, 	169, 	127, 	129, 	0, 		255, 	118, 	138, 
-	17, 	242, 	121, 	135, 	0, 		255, 	100, 	156, 
-	72, 	185, 	125, 	131, 	0, 		255, 	114, 	142, 
-	64, 	194, 	124, 	132, 	0, 		255, 	112, 	144, 
-	96, 	161, 	128, 	128, 	1, 		255, 	120, 	136, 
-	33, 	226, 	122, 	134, 	0, 		255, 	104, 	152, 
-	80, 	177, 	126, 	130, 	0, 		255, 	116, 	140, 
-	41, 	218, 	122, 	133, 	0, 		255, 	106, 	150, 
-	84, 	173, 	126, 	129, 	0, 		255, 	117, 	139, 
-	9, 	250, 	120, 	135, 	0, 		255, 	98, 	158, 
-	68, 	189, 	124, 	131, 	0, 		255, 	113, 	143, 
-	57, 	202, 	123, 	132, 	0, 		255, 	110, 	146, 
-	92, 	165, 	127, 	128, 	0, 		255, 	119, 	137, 
-	25, 	234, 	121, 	134, 	0, 		255, 	102, 	154, 
-	76, 	181, 	125, 	130, 	0, 		255, 	115, 	141, 
+	45, 	214, 	122, 	133, 	0, 		255, 	107, 	149,
+	86, 	171, 	126, 	129, 	0, 		255, 	117, 	138,
+	13, 	246, 	120, 	135, 	0, 		255, 	99, 	157,
+	70, 	187, 	124, 	131, 	0, 		255, 	113, 	142,
+	61, 	198, 	123, 	132,  	0, 		255, 	111, 	145,
+	94, 	163, 	127, 	128, 	0, 		255, 	119, 	136,
+	29, 	230, 	121, 	134, 	0, 		255, 	103, 	153,
+	78, 	179, 	125, 	130, 	0, 		255, 	115, 	140,
+	37, 	222, 	122, 	133, 	0, 		255, 	105, 	151,
+	82, 	175, 	126, 	129, 	0, 		255, 	116, 	139,
+	5, 	254, 	120, 	135, 	0, 		255, 	97, 	159,
+	66, 	191, 	124, 	131, 	0, 		255, 	112,	143,
+	53, 	206, 	123, 	132, 	0, 		255, 	109, 	147,
+	90, 	167, 	127, 	128, 	0, 		255,	118, 	137,
+	21, 	238, 	121, 	134, 	0, 		255, 	101,	155,
+	74, 	183, 	125, 	130, 	0, 		255, 	114, 	141,
+	49, 	210, 	123, 	133, 	0, 		255, 	108, 	148,
+	88, 	169, 	127, 	129, 	0, 		255, 	118, 	138,
+	17, 	242, 	121, 	135, 	0, 		255, 	100, 	156,
+	72, 	185, 	125, 	131, 	0, 		255, 	114, 	142,
+	64, 	194, 	124, 	132, 	0, 		255, 	112, 	144,
+	96, 	161, 	128, 	128, 	1, 		255, 	120, 	136,
+	33, 	226, 	122, 	134, 	0, 		255, 	104, 	152,
+	80, 	177, 	126, 	130, 	0, 		255, 	116, 	140,
+	41, 	218, 	122, 	133, 	0, 		255, 	106, 	150,
+	84, 	173, 	126, 	129, 	0, 		255, 	117, 	139,
+	9, 	250, 	120, 	135, 	0, 		255, 	98, 	158,
+	68, 	189, 	124, 	131, 	0, 		255, 	113, 	143,
+	57, 	202, 	123, 	132, 	0, 		255, 	110, 	146,
+	92, 	165, 	127, 	128, 	0, 		255, 	119, 	137,
+	25, 	234, 	121, 	134, 	0, 		255, 	102, 	154,
+	76, 	181, 	125, 	130, 	0, 		255, 	115, 	141,
 
 };
 
diff --git a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c
index bf1a90a..bf648a0 100644
--- a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -20,7 +20,7 @@
 */
 
 /*
- * $Id: yp_mkdb.c,v 1.1 1995/01/31 08:43:07 wpaul Exp $
+ * $Id: yp_mkdb.c,v 1.2 1995/03/31 19:45:13 wpaul Exp $
  */
 
 #define BUFFERSIZE 4096
@@ -103,7 +103,7 @@ load( char *FileName, char *DbName)
 	}
 
 	sprintf(filename, "%s~.db", DbName);
-	
+
 	if ((dp = dbopen(DbName,O_RDWR|O_EXCL|O_CREAT, PERM_SECURE,
 				DB_HASH, &openinfo)) == NULL) {
 		perror("dbopen");
@@ -199,7 +199,7 @@ main(int argc, char **argv)
 		int c=getopt(argc, argv, "ui:o:m:d:");
 		if (c==EOF) break;
 		switch (c) {
-		case 'u': 
+		case 'u':
 			UFlag++;
 			break;
 		case 'd':
diff --git a/gnu/usr.sbin/yppasswdd/pw_util.c b/gnu/usr.sbin/yppasswdd/pw_util.c
index 9ca2d16..45e3b9d 100644
--- a/gnu/usr.sbin/yppasswdd/pw_util.c
+++ b/gnu/usr.sbin/yppasswdd/pw_util.c
@@ -98,7 +98,7 @@ static int lockfd;
 int
 pw_lock()
 {
-	/* 
+	/*
 	 * If the master password file doesn't exist, the system is hosed.
 	 * Might as well try to build one.  Set the close-on-exec bit so
 	 * that users can't get at the encrypted passwords while editing.
@@ -162,7 +162,7 @@ pw_edit(notsetuid)
 		editor = _PATH_VI;
 	if (p = strrchr(editor, '/'))
 		++p;
-	else 
+	else
 		p = editor;
 
 	if (!(pid = vfork())) {
diff --git a/gnu/usr.sbin/yppasswdd/update.c b/gnu/usr.sbin/yppasswdd/update.c
index 5909712..0bb48a1 100644
--- a/gnu/usr.sbin/yppasswdd/update.c
+++ b/gnu/usr.sbin/yppasswdd/update.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * yppasswdd
  * Copyright 1994 Olaf Kirch, <okir@monad.swb.de>
  *
@@ -87,7 +87,7 @@ yppasswdproc_pwupdate_1(yppasswd *yppw, struct svc_req *rqstp)
 
     /* Check if the user exists
      */
-    if (!(pw = getpwnam(yppw->newpw.pw_name))) {        
+    if (!(pw = getpwnam(yppw->newpw.pw_name))) {
         syslog ( LOG_WARNING, "%s failed", logbuf );
         syslog ( LOG_WARNING, "User not in password file." );
         return (&res);
diff --git a/gnu/usr.sbin/yppasswdd/yppasswd.h b/gnu/usr.sbin/yppasswdd/yppasswd.h
index fb85d86..4f879ce 100644
--- a/gnu/usr.sbin/yppasswdd/yppasswd.h
+++ b/gnu/usr.sbin/yppasswdd/yppasswd.h
@@ -1,11 +1,11 @@
-/* 
+/*
  * yppasswdd
  * Copyright 1994 Olaf Kirch, <okir@monad.swb.de>
  *
  * This program is covered by the GNU General Public License, version 2.
  * It is provided in the hope that it is useful. However, the author
  * disclaims ALL WARRANTIES, expressed or implied. See the GPL for details.
- * 
+ *
  * This file was generated automatically by rpcgen from yppasswd.x, and
  * editied manually.
  */
diff --git a/gnu/usr.sbin/yppasswdd/yppasswdd.c b/gnu/usr.sbin/yppasswdd/yppasswdd.c
index 7b9a45f..5d350a4 100644
--- a/gnu/usr.sbin/yppasswdd/yppasswdd.c
+++ b/gnu/usr.sbin/yppasswdd/yppasswdd.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * yppasswdd
  * Copyright 1994 Olaf Kirch, <okir@monad.swb.de>
  *
diff --git a/gnu/usr.sbin/ypserv/Makefile.yp b/gnu/usr.sbin/ypserv/Makefile.yp
index a98b9c5..adc2143 100644
--- a/gnu/usr.sbin/ypserv/Makefile.yp
+++ b/gnu/usr.sbin/ypserv/Makefile.yp
@@ -1,7 +1,7 @@
 #
 # Makefile for the NIS databases
 #
-# $Id: Makefile.yp,v 1.5 1995/03/05 22:48:50 wpaul Exp $
+# $Id: Makefile.yp,v 1.6 1995/04/02 01:53:47 wpaul Exp $
 #
 # This Makefile should only be run on the NIS master server of a domain.
 # All updated maps will be pushed to all NIS slave servers listed in the
@@ -26,7 +26,7 @@ NOPUSH = "True"
 # passwords in them) to the superuser on other FreeBSD machines, but
 # non-FreeBSD clients (e.g. SunOS, Solaris (without NIS+), IRIX, HP-UX,
 # etc...) will only work properly in 'unsecure' mode.
-# 
+#
 #UNSECURE = "True"
 
 # These are commands which this Makefile needs to properly rebuild the
diff --git a/gnu/usr.sbin/ypserv/server.c b/gnu/usr.sbin/ypserv/server.c
index 750bf91..95ccd70 100644
--- a/gnu/usr.sbin/ypserv/server.c
+++ b/gnu/usr.sbin/ypserv/server.c
@@ -14,17 +14,17 @@
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ** General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public
 ** License along with the NYS YP Server; see the file COPYING.  If
 ** not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 ** Cambridge, MA 02139, USA.
 **
 ** Author: Peter Eriksson <pen@signum.se>
-** Ported to FreeBSD and hacked all to pieces 
+** Ported to FreeBSD and hacked all to pieces
 ** by Bill Paul <wpaul@ctr.columbia.edu>
 **
-**	$Id: server.c,v 1.4 1995/04/01 19:31:12 wpaul Exp $
+**	$Id: server.c,v 1.5 1995/05/03 14:36:12 wpaul Exp $
 **
 */
 
@@ -170,7 +170,7 @@ void *ypproc_null_2_svc(void *dummy,
 {
     static int foo;
     struct sockaddr_in *rqhost;
-    
+
 
     rqhost = svc_getcaller(rqstp->rq_xprt);
     if (!is_valid_host(rqhost))
@@ -184,14 +184,14 @@ void *ypproc_null_2_svc(void *dummy,
     return (void *) &foo;
 }
 
-    
+
 /*
 ** Return 1 if the name is a valid domain name served by us, else 0.
 */
 static int is_valid_domain(const char *domain)
 {
     struct stat sbuf;
-    
+
 
     if (domain == NULL ||
 	strcmp(domain, "binding") == 0 ||
@@ -199,7 +199,7 @@ static int is_valid_domain(const char *domain)
 	strcmp(domain, ".") == 0 ||
 	strchr(domain, '/'))
 	return 0;
-    
+
     if (stat(domain, &sbuf) < 0 || !S_ISDIR(sbuf.st_mode))
 	return 0;
 
@@ -213,10 +213,10 @@ bool_t *ypproc_domain_2_svc(domainname *name,
 {
     static bool_t result;
     struct sockaddr_in *rqhost;
-    
-    
+
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
-	
+
     if (debug_flag)
 	Perror("ypproc_domain(\"%s\") [From: %s:%d]\n",
 		*name,
@@ -227,19 +227,19 @@ bool_t *ypproc_domain_2_svc(domainname *name,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
-    
+
     if (is_valid_domain(*name))
 	result = TRUE;
     else
 	result = FALSE;
-    
+
     if (debug_flag)
 	Perror("\t-> %s.\n",
 		(result == TRUE ? "Ok" : "Not served by us"));
-    
+
     return &result;
 }
 
@@ -250,7 +250,7 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name,
     static bool_t result;
     struct sockaddr_in *rqhost;
 
-    
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -263,7 +263,7 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -275,10 +275,10 @@ bool_t *ypproc_domain_nonack_2_svc(domainname *name,
 	/* Bail out and don't return any RPC value */
 	return NULL;
     }
-    
+
     if (debug_flag)
 	Perror("\t-> OK.\n");
-    
+
     result = TRUE;
     return &result;
 }
@@ -300,12 +300,12 @@ static DB *open_database(const char *domain,
     strcpy(buf, domain);
     strcat(buf, "/");
     strcat(buf, map);
-    
+
     dbp = dbopen(buf,O_RDONLY|O_EXCL, PERM_SECURE, DB_HASH, &openinfo);
 
     if (debug_flag > 1 && dbp == NULL)
 	Perror("dbopen(): ",strerror(errno));
-    
+
     return dbp;
 }
 
@@ -326,8 +326,8 @@ int read_database(DB *dbp,
 {
     int first_flag = 0;
     DBT nkey, ckey, dummyval;
-    
-    
+
+
     if (ikey == NULL || ikey->data == NULL)
     {
 	(dbp->seq)(dbp,&ckey,&dummyval,R_FIRST);
@@ -351,7 +351,7 @@ int read_database(DB *dbp,
 	else
 	    ckey = *ikey;
     }
-    
+
     if (ckey.data == NULL)
     {
 	return (flags & F_NEXT) ? YP_NOMORE : YP_NOKEY;
@@ -375,14 +375,14 @@ int read_database(DB *dbp,
 		else
 		    return YP_FALSE;
 	}
-	
+
 	if ((flags & F_ALL) || strncmp(ckey.data, "YP_", 3) != 0)
 	{
 	    if (okey)
 		*okey = ckey;
 	    else if (ikey == NULL || ikey->data != ckey.data)
 		free(ckey.data);
-	    
+
 	    return YP_TRUE;
 	}
 
@@ -414,11 +414,11 @@ static unsigned long get_dtm(const char *domain,
     struct stat sbuf;
     char buf[1025];
 
-    
+
     strcpy(buf, domain);
     strcat(buf, "/");
     strcat(buf, map);
-    
+
     if (stat(buf, &sbuf) < 0)
 	return 0;
     else
@@ -435,7 +435,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
     static ypresp_val result;
     struct sockaddr_in *rqhost;
 
-    
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -443,7 +443,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
 	Perror("ypproc_match(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\t\tdomainname = \"%s\"\n",
 		key->domain);
 	Perror("\t\tmapname = \"%s\"\n",
@@ -457,7 +457,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -481,7 +481,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
 	free(result.val.valdat_val);
 	result.val.valdat_val = NULL;
     }
-    
+
     if (key->domain[0] == '\0' || key->map[0] == '\0')
 	result.stat = YP_BADARGS;
     else if (!is_valid_domain(key->domain))
@@ -489,7 +489,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
     else
     {
 	DBT rdat, qdat;
-	
+
 	DB *dbp = open_database(key->domain, key->map);
 	if (dbp == NULL)
 	    result.stat = YP_NOMAP;
@@ -509,7 +509,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
 	    (void)(dbp->close)(dbp);
 	}
     }
-	
+
 	if (debug_flag)
 	{
 	if (result.stat == YP_TRUE)
@@ -536,15 +536,15 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
 
 	if (debug_flag)
 	    Perror("Doing DNS lookup of %s\n", key->key.keydat_val);
-	
+
 	if (strcmp(key->map, "hosts.byname") == 0)
 	    cp = dnsname(key->key.keydat_val);
 	else  if (strcmp(key->map, "hosts.byaddr") == 0)
 	    cp = dnsaddr(key->key.keydat_val);
-	    
+
 	if (cp)
 	{
-	    
+
 	    if (debug_flag)
 		Perror("\t-> OK (%s)\n", cp);
 
@@ -563,7 +563,7 @@ ypresp_val *ypproc_match_2_svc(ypreq_key *key,
 	    result.stat = YP_NOKEY;
 	}
     }
-    
+
     return &result;
 }
 
@@ -574,7 +574,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
 {
     static ypresp_key_val result;
     struct sockaddr_in *rqhost;
-    
+
 
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
@@ -583,7 +583,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
 	Perror("ypproc_first(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\tdomainname = \"%s\"\n", key->domain);
 	Perror("\tmapname = \"%s\"\n", key->map);
 #if 0
@@ -597,7 +597,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -621,7 +621,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
 	free(result.key.keydat_val);
 	result.key.keydat_val = NULL;
     }
-    
+
     result.val.valdat_len = 0;
     if (result.val.valdat_val)
     {
@@ -636,7 +636,7 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
     else
     {
 	DBT dkey, dval;
-	
+
 	DB *dbp = open_database(key->domain, key->map);
 	if (dbp == NULL)
 	    result.stat = YP_NOMAP;
@@ -648,15 +648,15 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
 	    {
 		result.key.keydat_len = dkey.size;
 		result.key.keydat_val = dkey.data;
-		
+
 		result.val.valdat_len = dval.size;
 		result.val.valdat_val = dval.data;
 	    }
-	    
+
 	    (void)(dbp->close)(dbp);
 	}
     }
-    
+
     if (debug_flag)
     {
 	if (result.stat == YP_TRUE)
@@ -665,11 +665,11 @@ ypresp_key_val *ypproc_first_2_svc(ypreq_nokey *key,
 		    result.key.keydat_val,
 		    (int) result.val.valdat_len,
 		    result.val.valdat_val);
-		    
+
 	else
 	    Perror("\t-> Error #%d\n", result.stat);
     }
-    
+
     return &result;
 }
 
@@ -679,8 +679,8 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
 {
     static ypresp_key_val result;
     struct sockaddr_in *rqhost;
-    
-    
+
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -688,7 +688,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
 	Perror("ypproc_next(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\tdomainname = \"%s\"\n", key->domain);
 	Perror("\tmapname = \"%s\"\n", key->map);
 	Perror("\tkeydat = \"%.*s\"\n",
@@ -700,7 +700,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -724,14 +724,14 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
 	free(result.key.keydat_val);
 	result.key.keydat_val = NULL;
     }
-    
+
     result.val.valdat_len = 0;
     if (result.val.valdat_val)
     {
 	free(result.val.valdat_val);
 	result.val.valdat_val = NULL;
     }
-    
+
     if (key->map[0] == '\0' || key->domain[0] == '\0')
 	result.stat = YP_BADARGS;
     else if (!is_valid_domain(key->domain))
@@ -755,14 +755,14 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
 	    {
 		result.key.keydat_len = okey.size;
 		result.key.keydat_val = okey.data;
-		
+
 		result.val.valdat_len = dval.size;
 		result.val.valdat_val = dval.data;
 	    }
 	    (void)(dbp->close)(dbp);
 	}
     }
-    
+
     if (debug_flag)
     {
 	if (result.stat == YP_TRUE)
@@ -774,7 +774,7 @@ ypresp_key_val *ypproc_next_2_svc(ypreq_key *key,
 	else
 	    Perror("\t-> Error #%d\n", result.stat);
     }
-    
+
     return &result;
 }
 
@@ -817,7 +817,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr,
 	Perror("ypproc_xfr_2_svc(): [From: %s:%d]\n\tmap_parms:\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-	
+
 	print_ypmap_parms(&xfr->map_parms);
 	Perror("\t\ttransid = %u\n", xfr->transid);
 	Perror("\t\tprog = %u\n", xfr->prog);
@@ -828,7 +828,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -857,7 +857,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr,
 	    sprintf (g, "%u", xfr->prog);
 	    sprintf (p, "%u", xfr->port);
 	    execl(ypxfr_command, "ypxfr", "-d", xfr->map_parms.domain, "-h",
-		xfr->map_parms.peer, "-f", "-C", t, g, 
+		xfr->map_parms.peer, "-f", "-C", t, g,
 		inet_ntoa(rqhost->sin_addr), p, xfr->map_parms.map, NULL);
 	    Perror("ypxfr execl(): %s",strerror(errno));
 	    exit(0);
@@ -883,7 +883,7 @@ void *ypproc_clear_2_svc(void *dummy,
 {
     static int foo;
     struct sockaddr_in *rqhost;
-    
+
 
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
@@ -891,12 +891,12 @@ void *ypproc_clear_2_svc(void *dummy,
     	Perror("ypproc_clear_2_svc() [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
     if (!is_valid_host(rqhost))
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -927,7 +927,7 @@ static int ypall_encode(ypresp_key_val *val,
 
     dkey.data = val->key.keydat_val;
     dkey.size = val->key.keydat_len;
-    
+
     val->stat = read_database((DB *) data, &dkey, &okey, &dval, F_NEXT);
 
     if (val->stat == YP_TRUE)
@@ -939,7 +939,7 @@ static int ypall_encode(ypresp_key_val *val,
 	val->val.valdat_len = dval.size;
     }
 
-    
+
     return val->stat;
 }
 
@@ -951,7 +951,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
     extern __xdr_ypall_cb_t __xdr_ypall_cb;
     struct sockaddr_in *rqhost;
 
-    
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -959,7 +959,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
 	Perror("ypproc_all_2_svc(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\t\tdomain = \"%s\"\n", nokey->domain);
 	Perror("\t\tmap = \"%s\"\n", nokey->map);
     }
@@ -968,14 +968,14 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
     __xdr_ypall_cb.u.encode = NULL;
     __xdr_ypall_cb.u.close  = NULL;
     __xdr_ypall_cb.data = NULL;
-   
+
     result.more = TRUE;
 
     /*
@@ -991,7 +991,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
 	result.ypresp_all_u.val.stat = YP_YPERR;
 	return &result;
     }
-    
+
     if (nokey->map[0] == '\0' || nokey->domain[0] == '\0')
 	result.ypresp_all_u.val.stat = YP_BADARGS;
     else if (!is_valid_domain(nokey->domain))
@@ -999,7 +999,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
     else
     {
 	DBT dkey, dval;
-	
+
 	DB *dbp = open_database(nokey->domain, nokey->map);
 	if (dbp == NULL)
 	    result.ypresp_all_u.val.stat = YP_NOMAP;
@@ -1015,7 +1015,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
 	    {
 		result.ypresp_all_u.val.key.keydat_len = dkey.size;
 		result.ypresp_all_u.val.key.keydat_val = dkey.data;
-		
+
 		result.ypresp_all_u.val.val.valdat_len = dval.size;
 		result.ypresp_all_u.val.val.valdat_val = dval.data;
 
@@ -1029,7 +1029,7 @@ ypresp_all *ypproc_all_2_svc(ypreq_nokey *nokey,
 	    (void)(dbp->close)(dbp);
 	}
     }
-    
+
     return &result;
 }
 
@@ -1039,8 +1039,8 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey,
 {
     static ypresp_master result;
     struct sockaddr_in *rqhost;
-    
-    
+
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -1048,7 +1048,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey,
 	Perror("ypproc_master_2_svc(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\t\tdomain = \"%s\"\n", nokey->domain);
 	Perror("\t\tmap = \"%s\"\n", nokey->map);
     }
@@ -1057,7 +1057,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -1096,7 +1096,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey,
 
 	    key.size = sizeof("YP_MASTER_NAME")-1;
 	    key.data = "YP_MASTER_NAME";
-	    
+
 	    if ((dbp->get)(dbp,&key,&val,0))
 		val.data = NULL;
 
@@ -1125,7 +1125,7 @@ ypresp_master *ypproc_master_2_svc(ypreq_nokey *nokey,
 
     if (debug_flag)
 	Perror("\t-> Peer = \"%s\"\n", result.peer);
-    
+
     return &result;
 }
 
@@ -1135,8 +1135,8 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey,
 {
     static ypresp_order result;
     struct sockaddr_in *rqhost;
-    
-    
+
+
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
     if (debug_flag)
@@ -1144,7 +1144,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey,
 	Perror("ypproc_order_2_svc(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\t\tdomain = \"%s\"\n", nokey->domain);
 	Perror("\t\tmap = \"%s\"\n", nokey->map);
     }
@@ -1153,7 +1153,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
@@ -1188,7 +1188,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey,
 
 	    key.size = sizeof("YP_LAST_MODIFIED")-1;
 	    key.data = "YP_LAST_MODIFIED";
-	    
+
 	    (dbp->get)(dbp,&key,&val,0);
 	    if (val.data == NULL)
 	    {
@@ -1208,7 +1208,7 @@ ypresp_order *ypproc_order_2_svc(ypreq_nokey *nokey,
 
     if (debug_flag)
 	Perror("-> Order # %d\n", result.ordernum);
-    
+
     return &result;
 }
 
@@ -1257,7 +1257,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
 {
     static ypresp_maplist result;
     struct sockaddr_in *rqhost;
-    
+
 
     rqhost = svc_getcaller(rqstp->rq_xprt);
 
@@ -1266,7 +1266,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
 	Perror("ypproc_maplist_2_svc(): [From: %s:%d]\n",
 		inet_ntoa(rqhost->sin_addr),
 		ntohs(rqhost->sin_port));
-		
+
 	Perror("\t\tdomain = \"%s\"\n", *name);
     }
 
@@ -1274,13 +1274,13 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
     {
 	if (debug_flag)
 	    Perror("\t-> Ignored (not a valid source host)\n");
-	
+
 	return NULL;
     }
 
     if (result.maps)
 	free_maplist(result.maps);
-    
+
     result.maps = NULL;
 
     if ((*name)[0] == '\0')
@@ -1300,13 +1300,13 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
 	    {
 		Perror("%s: opendir: %s", progname,strerror(errno));
 	    }
-	    
+
 	    result.stat = YP_BADDB;
 	}
 	else
 	{
 	    struct dirent *dep;
-	    
+
 	    while ((dep = readdir(dp)) != NULL)
 		if (add_maplist(&result.maps, dep->d_name) < 0)
 		{
@@ -1317,7 +1317,7 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
 	    result.stat = YP_TRUE;
 	}
     }
-    
+
     if (debug_flag)
     {
 	if (result.stat == YP_TRUE)
@@ -1336,6 +1336,6 @@ ypresp_maplist *ypproc_maplist_2_svc(domainname *name,
 	else
 	    Perror("\t-> Error #%d\n", result.stat);
     }
-    
+
     return &result;
 }
diff --git a/gnu/usr.sbin/ypserv/yp.h b/gnu/usr.sbin/ypserv/yp.h
index fde95cd..5a3b33a 100644
--- a/gnu/usr.sbin/ypserv/yp.h
+++ b/gnu/usr.sbin/ypserv/yp.h
@@ -10,7 +10,7 @@
  * Modification history:
  *    940716 pen@signum.se      Change "ypreq_key" to "ypreq_nokey" for FIRST.
  *
- *	$Id$
+ *	$Id: yp.h,v 1.1 1995/01/31 08:58:55 wpaul Exp $
  */
 
 #ifndef _YP_H_RPCGEN
@@ -40,13 +40,13 @@ enum ypstat {
 	YP_VERS = -8
 };
 typedef enum ypstat ypstat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypstat(XDR *, ypstat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypstat(XDR *, ypstat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypstat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum ypxfrstat {
@@ -68,69 +68,69 @@ enum ypxfrstat {
 	YPXFR_REFUSED = -14
 };
 typedef enum ypxfrstat ypxfrstat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypxfrstat(XDR *, ypxfrstat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypxfrstat(XDR *, ypxfrstat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypxfrstat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *domainname;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_domainname(XDR *, domainname*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_domainname(XDR *, domainname*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_domainname();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *mapname;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_mapname(XDR *, mapname*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_mapname(XDR *, mapname*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_mapname();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *peername;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_peername(XDR *, peername*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_peername(XDR *, peername*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_peername();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef struct {
 	u_int keydat_len;
 	char *keydat_val;
 } keydat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_keydat(XDR *, keydat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_keydat(XDR *, keydat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_keydat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef struct {
 	u_int valdat_len;
 	char *valdat_val;
 } valdat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_valdat(XDR *, valdat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_valdat(XDR *, valdat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_valdat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypmap_parms {
@@ -140,13 +140,13 @@ struct ypmap_parms {
 	peername peer;
 };
 typedef struct ypmap_parms ypmap_parms;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypmap_parms(XDR *, ypmap_parms*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypmap_parms(XDR *, ypmap_parms*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypmap_parms();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_key {
@@ -155,13 +155,13 @@ struct ypreq_key {
 	keydat key;
 };
 typedef struct ypreq_key ypreq_key;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypreq_key(XDR *, ypreq_key*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypreq_key(XDR *, ypreq_key*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypreq_key();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_nokey {
@@ -169,13 +169,13 @@ struct ypreq_nokey {
 	mapname map;
 };
 typedef struct ypreq_nokey ypreq_nokey;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypreq_nokey();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_xfr {
@@ -185,13 +185,13 @@ struct ypreq_xfr {
 	u_int port;
 };
 typedef struct ypreq_xfr ypreq_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypreq_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_val {
@@ -199,13 +199,13 @@ struct ypresp_val {
 	valdat val;
 };
 typedef struct ypresp_val ypresp_val;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_val(XDR *, ypresp_val*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_val(XDR *, ypresp_val*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_val();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_key_val {
@@ -214,13 +214,13 @@ struct ypresp_key_val {
 	valdat val;
 };
 typedef struct ypresp_key_val ypresp_key_val;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_key_val();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_master {
@@ -228,13 +228,13 @@ struct ypresp_master {
 	peername peer;
 };
 typedef struct ypresp_master ypresp_master;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_master(XDR *, ypresp_master*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_master(XDR *, ypresp_master*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_master();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_order {
@@ -242,13 +242,13 @@ struct ypresp_order {
 	u_int ordernum;
 };
 typedef struct ypresp_order ypresp_order;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_order(XDR *, ypresp_order*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_order(XDR *, ypresp_order*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_order();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef struct
@@ -269,13 +269,13 @@ struct ypresp_all {
 	} ypresp_all_u;
 };
 typedef struct ypresp_all ypresp_all;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_all(XDR *, ypresp_all*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_all(XDR *, ypresp_all*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_all();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_xfr {
@@ -283,13 +283,13 @@ struct ypresp_xfr {
 	ypxfrstat xfrstat;
 };
 typedef struct ypresp_xfr ypresp_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypmaplist {
@@ -297,13 +297,13 @@ struct ypmaplist {
 	struct ypmaplist *next;
 };
 typedef struct ypmaplist ypmaplist;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypmaplist(XDR *, ypmaplist*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypmaplist(XDR *, ypmaplist*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypmaplist();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_maplist {
@@ -311,13 +311,13 @@ struct ypresp_maplist {
 	ypmaplist *maps;
 };
 typedef struct ypresp_maplist ypresp_maplist;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypresp_maplist();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum yppush_status {
@@ -339,13 +339,13 @@ enum yppush_status {
 	YPPUSH_REFUSED = -14
 };
 typedef enum yppush_status yppush_status;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_yppush_status(XDR *, yppush_status*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_yppush_status(XDR *, yppush_status*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_yppush_status();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct yppushresp_xfr {
@@ -353,13 +353,13 @@ struct yppushresp_xfr {
 	yppush_status status;
 };
 typedef struct yppushresp_xfr yppushresp_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_yppushresp_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum ypbind_resptype {
@@ -367,13 +367,13 @@ enum ypbind_resptype {
 	YPBIND_FAIL_VAL = 2
 };
 typedef enum ypbind_resptype ypbind_resptype;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypbind_resptype();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypbind_binding {
@@ -381,13 +381,13 @@ struct ypbind_binding {
 	char ypbind_binding_port[2];
 };
 typedef struct ypbind_binding ypbind_binding;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypbind_binding(XDR *, ypbind_binding*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypbind_binding(XDR *, ypbind_binding*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypbind_binding();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypbind_resp {
@@ -398,13 +398,13 @@ struct ypbind_resp {
 	} ypbind_resp_u;
 };
 typedef struct ypbind_resp ypbind_resp;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypbind_resp(XDR *, ypbind_resp*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypbind_resp(XDR *, ypbind_resp*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypbind_resp();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPBIND_ERR_ERR 1
 #define YPBIND_ERR_NOSERV 2
@@ -416,13 +416,13 @@ struct ypbind_setdom {
 	u_int ypsetdom_vers;
 };
 typedef struct ypbind_setdom ypbind_setdom;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t __xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t __xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t __xdr_ypbind_setdom();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 #define YPPROG ((u_long)100004)
@@ -504,7 +504,7 @@ extern  ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *);
 extern  ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *);
 extern  ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPPROC_NULL ((u_long)0)
 extern  void * ypproc_null_2();
 extern  void * ypproc_null_2_svc();
@@ -541,7 +541,7 @@ extern  ypresp_order * ypproc_order_2_svc();
 #define YPPROC_MAPLIST ((u_long)11)
 extern  ypresp_maplist * ypproc_maplist_2();
 extern  ypresp_maplist * ypproc_maplist_2_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPPUSH_XFRRESPPROG ((u_long)0x40000000)
 #define YPPUSH_XFRRESPVERS ((u_long)1)
@@ -562,14 +562,14 @@ extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
 extern  yppushresp_xfr * yppushproc_xfrresp_1(void *, CLIENT *);
 extern  yppushresp_xfr * yppushproc_xfrresp_1_svc(void *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPPUSHPROC_NULL ((u_long)0)
 extern  void * yppushproc_null_1();
 extern  void * yppushproc_null_1_svc();
 #define YPPUSHPROC_XFRRESP ((u_long)1)
 extern  yppushresp_xfr * yppushproc_xfrresp_1();
 extern  yppushresp_xfr * yppushproc_xfrresp_1_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPBINDPROG ((u_long)100007)
 #define YPBINDVERS ((u_long)2)
@@ -596,7 +596,7 @@ extern  ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *);
 extern  void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *);
 extern  void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPBINDPROC_NULL ((u_long)0)
 extern  void * ypbindproc_null_2();
 extern  void * ypbindproc_null_2_svc();
@@ -606,6 +606,6 @@ extern  ypbind_resp * ypbindproc_domain_2_svc();
 #define YPBINDPROC_SETDOM ((u_long)2)
 extern  void * ypbindproc_setdom_2();
 extern  void * ypbindproc_setdom_2_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #endif /* !_YP_H_RPCGEN */
diff --git a/gnu/usr.sbin/ypserv/yp_svc.c b/gnu/usr.sbin/ypserv/yp_svc.c
index ea5fe73..b4ce749 100644
--- a/gnu/usr.sbin/ypserv/yp_svc.c
+++ b/gnu/usr.sbin/ypserv/yp_svc.c
@@ -6,7 +6,7 @@
  * And thus replied Lpd@NannyMUD:
  *    Who cares? :-) /Peter Eriksson <pen@signum.se>
  *
- *	$Id: yp_svc.c,v 1.1 1995/01/31 08:58:56 wpaul Exp $
+ *	$Id: yp_svc.c,v 1.2 1995/04/05 03:23:38 wpaul Exp $
  */
 
 #include "system.h"
@@ -262,7 +262,7 @@ int main(int argc, char **argv)
     struct sockaddr_in	socket_address;
     int			result;
     int			sunos_4_kludge = 0;
-    
+
     progname = strrchr (argv[0], '/');
     if (progname == (char *) NULL)
 	progname = argv[0];
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
 	progname++;
 
     openlog(progname, LOG_PID, TCPW_FACILITY);
-    
+
     for (i = 1; i < argc && argv[i][0] == '-'; i++)
     {
 	if (strcmp(argv[i], "-debug") == 0 || strcmp(argv[i], "-d") == 0)
@@ -313,7 +313,7 @@ int main(int argc, char **argv)
 	Perror("%s: chdir: %", argv[0], strerror(errno));
 	exit(1);
     }
-	
+
     (void) pmap_unset(YPPROG, YPVERS);
     if (sunos_4_kludge)
 	(void) pmap_unset(YPPROG, 1);
@@ -403,7 +403,7 @@ int main(int argc, char **argv)
 	Perror("%s: unable to register (YPPROG, YPVERS, tcp)\n", progname);
 	exit(1);
     }
-	
+
     svc_run();
     Perror("svc_run returned");
     exit(1);
diff --git a/gnu/usr.sbin/ypserv/yp_xdr.c b/gnu/usr.sbin/ypserv/yp_xdr.c
index bb70473..9e88645 100644
--- a/gnu/usr.sbin/ypserv/yp_xdr.c
+++ b/gnu/usr.sbin/ypserv/yp_xdr.c
@@ -11,7 +11,7 @@
  *    940616 pen@signum.se	Major cleanups.
  *    940713 pen@signum.se	Added SunOS 4 prototypes.
  *
- * 	$Id$ 
+ * 	$Id: yp_xdr.c,v 1.1 1995/01/31 08:58:57 wpaul Exp $
  */
 
 #include "system.h"
@@ -227,12 +227,12 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp)
 
 		return FALSE;
 	    }
-	    
+
 	    if (!__xdr_ypresp_key_val(xdrs, &objp->ypresp_all_u.val))
 	    {
 		if (__xdr_ypall_cb.u.close != NULL)
 		    (*(__xdr_ypall_cb.u.close))(__xdr_ypall_cb.data);
-		
+
 		__xdr_ypall_cb.data = NULL;
 
 		return FALSE;
@@ -244,32 +244,32 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp)
 
 		if (__xdr_ypall_cb.u.close != NULL)
 		    (*(__xdr_ypall_cb.u.close))(__xdr_ypall_cb.data);
-		
+
 		__xdr_ypall_cb.data = NULL;
-		
+
 		if (!xdr_bool(xdrs, &objp->more))
 		    return FALSE;
-		
+
 		return TRUE;
 	    }
 
 	    if ((*__xdr_ypall_cb.u.encode)(&objp->ypresp_all_u.val,
 					 __xdr_ypall_cb.data) == YP_NOKEY)
 		objp->more = FALSE;
-	}	
+	}
     }
-    
+
 #ifdef NOTYET /* This code isn't needed in the server */
     else if (xdrs->x_op == XDR_DECODE)
     {
 	int more = 0;
 
-	
+
 	while (1)
 	{
 	    if (!xdr_bool(xdrs, &objp->more))
 		return FALSE;
-	
+
 	    switch (objp->more)
 	    {
 	      case TRUE:
@@ -280,10 +280,10 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp)
 		    more = (*__xdr_ypall_callback->foreach.decoder)
 			(&objp->ypresp_all_u.val, __xdr_ypall_callback->data);
 		break;
-		
+
 	      case FALSE:
 		return TRUE;
-		
+
 	      default:
 		return FALSE;
 	    }
@@ -314,7 +314,7 @@ __xdr_ypmaplist(XDR *xdrs, ypmaplist *objp)
 	return FALSE;
 
     if (!xdr_pointer(xdrs, (char **)&objp->next, sizeof(ypmaplist),
-		     (xdrproc_t)__xdr_ypmaplist)) 
+		     (xdrproc_t)__xdr_ypmaplist))
 	return FALSE;
 
     return TRUE;
@@ -387,12 +387,12 @@ __xdr_ypbind_resp(XDR *xdrs, ypbind_resp *objp)
 	if (!xdr_u_int(xdrs, &objp->ypbind_resp_u.ypbind_error))
 	    return FALSE;
 	break;
-	
+
       case YPBIND_SUCC_VAL:
 	if (!__xdr_ypbind_binding(xdrs, &objp->ypbind_resp_u.ypbind_bindinfo))
 	    return FALSE;
 	break;
-	
+
       default:
 	return FALSE;
     }