From a48dbb677a47fdd0241cfaab7a602f198061486f Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 29 Apr 2006 06:59:23 +0000 Subject: [PATCH] Don't test HAVE_C_STRUCTURE_ASSIGNMENT. Instead, just assume we do have a working C compiler. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17969 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/auth_con.c | 4 ---- src/lib/krb5/krb/copy_addrs.c | 4 ---- src/lib/krb5/krb/copy_athctr.c | 4 ---- src/lib/krb5/krb/copy_auth.c | 4 ---- src/lib/krb5/krb/copy_cksum.c | 4 ---- src/lib/krb5/krb/copy_creds.c | 6 +----- src/lib/krb5/krb/copy_key.c | 4 ---- src/lib/krb5/krb/copy_princ.c | 6 +----- src/lib/krb5/krb/copy_tick.c | 8 -------- src/lib/krb5/krb/get_creds.c | 4 ---- src/lib/krb5/krb/mk_req_ext.c | 4 ---- 11 files changed, 2 insertions(+), 50 deletions(-) diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index cd3acf176..ca33862fd 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -10,11 +10,7 @@ actx_copy_addr(krb5_context context, const krb5_address *inad, krb5_address **ou if (!(tmpad = (krb5_address *)malloc(sizeof(*tmpad)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tmpad = *inad; -#else - memcpy(tmpad, inad, sizeof(krb5_address)); -#endif if (!(tmpad->contents = (krb5_octet *)malloc(inad->length))) { krb5_xfree(tmpad); return ENOMEM; diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 0e9ee702c..28f19facc 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -36,11 +36,7 @@ krb5_copy_addr(krb5_context context, const krb5_address *inad, krb5_address **ou if (!(tmpad = (krb5_address *)malloc(sizeof(*tmpad)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tmpad = *inad; -#else - memcpy(tmpad, inad, sizeof(krb5_address)); -#endif if (!(tmpad->contents = (krb5_octet *)malloc(inad->length))) { krb5_xfree(tmpad); return ENOMEM; diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index 4b852a435..2694776c2 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -37,11 +37,7 @@ krb5_copy_authenticator(krb5_context context, const krb5_authenticator *authfrom if (!(tempto = (krb5_authenticator *)malloc(sizeof(*tempto)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tempto = *authfrom; -#else - memcpy(tempto, authfrom, sizeof(krb5_authenticator)); -#endif retval = krb5_copy_principal(context, authfrom->client, &tempto->client); if (retval) { diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 19e026411..9c978cb6b 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -36,11 +36,7 @@ krb5_copy_authdatum(krb5_context context, const krb5_authdata *inad, krb5_authda if (!(tmpad = (krb5_authdata *)malloc(sizeof(*tmpad)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tmpad = *inad; -#else - memcpy(tmpad, inad, sizeof(krb5_authdata)); -#endif if (!(tmpad->contents = (krb5_octet *)malloc(inad->length))) { krb5_xfree(tmpad); return ENOMEM; diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index 38b267159..ce7eb7aa7 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -36,11 +36,7 @@ krb5_copy_checksum(krb5_context context, const krb5_checksum *ckfrom, krb5_check if (!(tempto = (krb5_checksum *)malloc(sizeof(*tempto)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tempto = *ckfrom; -#else - memcpy(tempto, ckfrom, sizeof(krb5_checksum)); -#endif if (!(tempto->contents = (krb5_octet *)malloc(tempto->length))) { diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 2be195055..9f1429c08 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -43,11 +43,7 @@ krb5_copy_creds(krb5_context context, const krb5_creds *incred, krb5_creds **out if (!(tempcred = (krb5_creds *)malloc(sizeof(*tempcred)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT - *tempcred = *incred; /* copy everything quickly */ -#else - memcpy(tempcred, incred, sizeof(krb5_creds)); -#endif + *tempcred = *incred; retval = krb5_copy_principal(context, incred->client, &tempcred->client); if (retval) goto cleanlast; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index d2640ed58..1bb04c199 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -39,11 +39,7 @@ krb5_copy_keyblock(krb5_context context, const krb5_keyblock *from, krb5_keybloc if (!(new_key = (krb5_keyblock *) malloc(sizeof(krb5_keyblock)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *new_key = *from; -#else - memcpy(new_key, from, sizeof(krb5_keyblock)); -#endif if (!(new_key->contents = (krb5_octet *)malloc(new_key->length))) { krb5_xfree(new_key); return(ENOMEM); diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index f62323695..d16c17b5c 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -43,11 +43,7 @@ krb5_copy_principal(krb5_context context, krb5_const_principal inprinc, krb5_pri if (tempprinc == 0) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT - *tempprinc = *inprinc; /* Copy all of the non-allocated pieces */ -#else - memcpy(tempprinc, inprinc, sizeof(krb5_principal_data)); -#endif + *tempprinc = *inprinc; nelems = (int) krb5_princ_size(context, inprinc); tempprinc->data = malloc(nelems * sizeof(krb5_data)); diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index 00f235d3c..43268e50f 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -37,11 +37,7 @@ krb5_copy_enc_tkt_part(krb5_context context, const krb5_enc_tkt_part *partfrom, if (!(tempto = (krb5_enc_tkt_part *)malloc(sizeof(*tempto)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tempto = *partfrom; -#else - memcpy(tempto, partfrom, sizeof(krb5_enc_tkt_part)); -#endif retval = krb5_copy_keyblock(context, partfrom->session, &tempto->session); if (retval) { @@ -104,11 +100,7 @@ krb5_copy_ticket(krb5_context context, const krb5_ticket *from, krb5_ticket **pt if (!(tempto = (krb5_ticket *)malloc(sizeof(*tempto)))) return ENOMEM; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tempto = *from; -#else - memcpy(tempto, from, sizeof(krb5_ticket)); -#endif retval = krb5_copy_principal(context, from->server, &tempto->server); if (retval) { krb5_xfree(tempto); diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index 7dd3ad6c9..b3e94f4c6 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -62,11 +62,7 @@ krb5_get_credentials_core(krb5_context context, krb5_flags options, retval = krb5_timeofday(context, &mcreds->times.endtime); if (retval != 0) return retval; } -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT mcreds->keyblock = in_creds->keyblock; -#else - memcpy(&mcreds->keyblock, &in_creds->keyblock, sizeof(krb5_keyblock)); -#endif mcreds->authdata = in_creds->authdata; mcreds->server = in_creds->server; mcreds->client = in_creds->client; diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 9066567ba..e5cb43a52 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -233,11 +233,7 @@ krb5_mk_req_extended(krb5_context context, krb5_auth_context *auth_context, if ((retval = encode_krb5_ap_req(&request, &toutbuf))) goto cleanup_cksum; -#ifdef HAVE_C_STRUCTURE_ASSIGNMENT *outbuf = *toutbuf; -#else - memcpy(outbuf, toutbuf, sizeof(krb5_data)); -#endif krb5_xfree(toutbuf); -- 2.26.2