BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / timed / timed / master.c

diff --git a/usr/src/usr.sbin/timed/timed/master.c b/usr/src/usr.sbin/timed/timed/master.c
index 5772d07..8eacdc3 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/master.c
+++ b/usr/src/usr.sbin/timed/timed/master.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)master.c   2.19 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)master.c   2.20 (Berkeley) 3/2/91";

 #endif /* not lint */
 
 #include "globals.h"
 #endif /* not lint */
 
 #include "globals.h"


@@ -96,7 +110,8 @@ loop:
                        (void)strcpy(to.tsp_name, hostname);
                        bytenetorder(&to);
                        if (sendto(sock, (char *)&to, sizeof(struct tsp), 0,
                        (void)strcpy(to.tsp_name, hostname);
                        bytenetorder(&to);
                        if (sendto(sock, (char *)&to, sizeof(struct tsp), 0,

-                           &ntp->dest_addr, sizeof(struct sockaddr_in)) < 0) {
+                           (struct sockaddr *)&ntp->dest_addr,
+                           sizeof(struct sockaddr_in)) < 0) {

                                syslog(LOG_ERR, "sendto: %m");
                                exit(1);
                        }
                                syslog(LOG_ERR, "sendto: %m");
                                exit(1);
                        }


@@ -134,7 +149,8 @@ loop:
                        (void)strcpy(msg->tsp_name, hostname);
                        bytenetorder(msg);
                        if (sendto(sock, (char *)msg, sizeof(struct tsp), 0,
                        (void)strcpy(msg->tsp_name, hostname);
                        bytenetorder(msg);
                        if (sendto(sock, (char *)msg, sizeof(struct tsp), 0,

-                           &saveaddr, sizeof(struct sockaddr_in)) < 0) {
+                           (struct sockaddr *)&saveaddr,
+                           sizeof(struct sockaddr_in)) < 0) {

                                syslog(LOG_ERR, "sendto: %m");
                                exit(1);
                        }
                                syslog(LOG_ERR, "sendto: %m");
                                exit(1);
                        }


@@ -495,7 +511,8 @@ struct netinfo *net;
        to.tsp_vers = TSPVERSION;
        (void)strcpy(to.tsp_name, hostname);
        bytenetorder(&to);
        to.tsp_vers = TSPVERSION;
        (void)strcpy(to.tsp_name, hostname);
        bytenetorder(&to);

-       if (sendto(sock, (char *)&to, sizeof(struct tsp), 0, &net->dest_addr,
+       if (sendto(sock, (char *)&to, sizeof(struct tsp), 0,
+           (struct sockaddr *)&net->dest_addr,

            sizeof(struct sockaddr_in)) < 0) {
                syslog(LOG_ERR, "sendto: %m");
                exit(1);
            sizeof(struct sockaddr_in)) < 0) {
                syslog(LOG_ERR, "sendto: %m");
                exit(1);