summaryrefslogtreecommitdiffstats
path: root/src/appl/simple/server
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
committerTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
commite73566996463fb1947cf80ad2e11fadce3dc0b66 (patch)
tree4c75494b8a5a0e1169c37bcac34cc0aeccda7de2 /src/appl/simple/server
parent20b3f46e04d4d0104dc971d22793011f20f2e51c (diff)
downloadkrb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.gz
krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.xz
krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.zip
Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*
include the doc subtree!!) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/simple/server')
-rw-r--r--src/appl/simple/server/ChangeLog5
-rw-r--r--src/appl/simple/server/sim_server.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 58042da37..6e30ce4a4 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 22 15:48:42 1996 unknown <bjaspan@mit.edu>
+
+ * sim_server.c (argv): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Thu Nov 7 15:26:44 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* sim_server.c (argv): Check the error return from
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 551a4f36c..255d786f2 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -151,7 +151,7 @@ char *argv[];
fprintf(stderr, "%s: host unknown\n", full_hname);
exit(1);
}
- memcpy((char *)&s_sock.sin_addr, host->h_addr, host->h_length);
+ memcpy((char *)&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
/* Open socket */
if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {