BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / talk / look_up.c

diff --git a/usr/src/usr.bin/talk/look_up.c b/usr/src/usr.bin/talk/look_up.c
index 8a93c47..90ae814 100644 (file)
--- a/usr/src/usr.bin/talk/look_up.c
+++ b/usr/src/usr.bin/talk/look_up.c
@@ -3,15 +3,22 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)look_up.c  5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)look_up.c  5.6 (Berkeley) 6/1/90";

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


@@ -25,8 +32,13 @@ check_local()
        register CTL_RESPONSE *rp = &response;
 
        /* the rest of msg was set up in get_names */
        register CTL_RESPONSE *rp = &response;
 
        /* the rest of msg was set up in get_names */

+#ifdef MSG_EOR
+       /* copy new style sockaddr to old, swap family (short in old) */
+       msg.ctl_addr = *(struct osockaddr *)&ctl_addr;
+       msg.ctl_addr.sa_family = htons(ctl_addr.sin_family);
+#else

        msg.ctl_addr = *(struct sockaddr *)&ctl_addr;
        msg.ctl_addr = *(struct sockaddr *)&ctl_addr;

-       msg.ctl_addr.sa_family = htons(msg.ctl_addr.sa_family);
+#endif

        /* must be initiating a talk */
        if (!look_for_invite(rp))
                return (0);
        /* must be initiating a talk */
        if (!look_for_invite(rp))
                return (0);