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/kadmin/v4server | |
| 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/kadmin/v4server')
| -rw-r--r-- | src/kadmin/v4server/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/v4server/kadm_ser_wrap.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog index 7572a6380..2966ad100 100644 --- a/src/kadmin/v4server/ChangeLog +++ b/src/kadmin/v4server/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 22 15:49:27 1996 unknown <bjaspan@mit.edu> + + * kadm_ser_wrap.c (endif ): use sizeof instead of h_length to + determine number of bytes of addr to copy from DNS response + [krb5-misc/211] + Wed Nov 13 19:24:00 1996 Tom Yu <tlyu@mit.edu> * Makefile.in (clean): Remove kadm_err.h and kadm_err.c. diff --git a/src/kadmin/v4server/kadm_ser_wrap.c b/src/kadmin/v4server/kadm_ser_wrap.c index 3d4c045ed..7ea289f24 100644 --- a/src/kadmin/v4server/kadm_ser_wrap.c +++ b/src/kadmin/v4server/kadm_ser_wrap.c @@ -82,7 +82,7 @@ kadm_ser_init(inter, realm) if ((hp = gethostbyname(hostname)) == NULL) return KADM_NO_HOSTNAME; memcpy((char *) &server_parm.admin_addr.sin_addr.s_addr, hp->h_addr, - hp->h_length); + sizeof(server_parm.admin_addr.sin_addr.s_addr)); server_parm.admin_addr.sin_port = sep->s_port; /* setting up the database */ mkey_name = KRB5_KDB_M_NAME; |