diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-12-13 19:28:16 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-12-13 19:28:16 +0000 |
| commit | e73566996463fb1947cf80ad2e11fadce3dc0b66 (patch) | |
| tree | 4c75494b8a5a0e1169c37bcac34cc0aeccda7de2 /src/appl/simple | |
| parent | 20b3f46e04d4d0104dc971d22793011f20f2e51c (diff) | |
| download | krb5-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')
| -rw-r--r-- | src/appl/simple/client/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/simple/client/sim_client.c | 4 | ||||
| -rw-r--r-- | src/appl/simple/server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/simple/server/sim_server.c | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog index 275d42bf2..db1136c43 100644 --- a/src/appl/simple/client/ChangeLog +++ b/src/appl/simple/client/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 22 15:48:30 1996 unknown <bjaspan@mit.edu> + + * sim_client.c (main): 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:10 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> * sim_client.c (main): Check the error return from diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c index 9def2603c..a573dfa54 100644 --- a/src/appl/simple/client/sim_client.c +++ b/src/appl/simple/client/sim_client.c @@ -163,7 +163,7 @@ main(argc, argv) /* Set server's address */ (void) memset((char *)&s_sock, 0, sizeof(s_sock)); - 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)); #ifdef DEBUG printf("s_sock.sin_addr is %s\n", inet_ntoa(s_sock.sin_addr)); #endif @@ -198,7 +198,7 @@ main(argc, argv) fprintf(stderr, "%s: unknown host\n", hostname); exit(1); } - memcpy((char *)&c_sock.sin_addr, host->h_addr, host->h_length); + memcpy((char *)&c_sock.sin_addr, host->h_addr, sizeof(c_sock.sin_addr)); #endif 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) { |