diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2010-02-10 13:01:33 +0100 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-18 13:48:44 -0500 |
commit | 29e9f5e711a03135944e30ad241c8182dacc6049 (patch) | |
tree | 0da07910b6618ced8b16d0011ad023687efed7cc /server/providers/krb5 | |
parent | 2c5bf74c71443f1680fef4fc0daa4a4c9dd10ad8 (diff) | |
download | sssd-29e9f5e711a03135944e30ad241c8182dacc6049.tar.gz sssd-29e9f5e711a03135944e30ad241c8182dacc6049.tar.bz2 sssd-29e9f5e711a03135944e30ad241c8182dacc6049.zip |
Use macros to hide memcpy calls
The memcpy calls introduced in the memalign patches are ugly. This patch
hides them behind a set of macros.
Diffstat (limited to 'server/providers/krb5')
-rw-r--r-- | server/providers/krb5/krb5_auth.c | 59 | ||||
-rw-r--r-- | server/providers/krb5/krb5_child.c | 67 |
2 files changed, 30 insertions, 96 deletions
diff --git a/server/providers/krb5/krb5_auth.c b/server/providers/krb5/krb5_auth.c index 50f033eb..a2dadc80 100644 --- a/server/providers/krb5/krb5_auth.c +++ b/server/providers/krb5/krb5_auth.c @@ -301,7 +301,6 @@ errno_t create_send_buffer(struct krb5child_req *kr, struct io_buffer **io_buf) size_t rp; const char *keytab; uint32_t validate; - uint32_t c = 0; keytab = dp_opt_get_cstring(kr->krb5_ctx->opts, KRB5_KEYTAB); if (keytab == NULL) { @@ -332,54 +331,28 @@ errno_t create_send_buffer(struct krb5child_req *kr, struct io_buffer **io_buf) } rp = 0; - memcpy(&buf->data[rp], &kr->pd->cmd, sizeof(uint32_t)); - rp += sizeof(uint32_t); + COPY_UINT32(&buf->data[rp], &kr->pd->cmd, rp); + COPY_UINT32(&buf->data[rp], &kr->pd->pw_uid, rp); + COPY_UINT32(&buf->data[rp], &kr->pd->gr_gid, rp); + COPY_UINT32(&buf->data[rp], &validate, rp); + COPY_UINT32(&buf->data[rp], &kr->is_offline, rp); - memcpy(&buf->data[rp], &kr->pd->pw_uid, sizeof(uint32_t)); - rp += sizeof(uint32_t); + COPY_UINT32_VALUE(&buf->data[rp], strlen(kr->pd->upn), rp); + COPY_MEM(&buf->data[rp], kr->pd->upn, rp, strlen(kr->pd->upn)); - memcpy(&buf->data[rp], &kr->pd->gr_gid, sizeof(uint32_t)); - rp += sizeof(uint32_t); + COPY_UINT32_VALUE(&buf->data[rp], strlen(kr->ccname), rp); + COPY_MEM(&buf->data[rp], kr->ccname, rp, strlen(kr->ccname)); - memcpy(&buf->data[rp], &validate, sizeof(uint32_t)); - rp += sizeof(uint32_t); + COPY_UINT32_VALUE(&buf->data[rp], strlen(keytab), rp); + COPY_MEM(&buf->data[rp], keytab, rp, strlen(keytab)); - memcpy(&buf->data[rp], &kr->is_offline, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - c = (uint32_t) strlen(kr->pd->upn); - memcpy(&buf->data[rp], &c, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - memcpy(&buf->data[rp], kr->pd->upn, c); - rp += c; - - c = (uint32_t) strlen(kr->ccname); - memcpy(&buf->data[rp], &c, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - memcpy(&buf->data[rp], kr->ccname, c); - rp += strlen(kr->ccname); - - c = (uint32_t) strlen(keytab); - memcpy(&buf->data[rp], &c, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - memcpy(&buf->data[rp], keytab, c); - rp += strlen(keytab); - - memcpy(&buf->data[rp], &kr->pd->authtok_size, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - memcpy(&buf->data[rp], kr->pd->authtok, kr->pd->authtok_size); - rp += kr->pd->authtok_size; + COPY_UINT32(&buf->data[rp], &kr->pd->authtok_size, rp); + COPY_MEM(&buf->data[rp], kr->pd->authtok, rp, kr->pd->authtok_size); if (kr->pd->cmd == SSS_PAM_CHAUTHTOK) { - memcpy(&buf->data[rp], &kr->pd->newauthtok_size, sizeof(uint32_t)); - rp += sizeof(uint32_t); - - memcpy(&buf->data[rp], kr->pd->newauthtok, kr->pd->newauthtok_size); - rp += kr->pd->newauthtok_size; + COPY_UINT32(&buf->data[rp], &kr->pd->newauthtok_size, rp); + COPY_MEM(&buf->data[rp], kr->pd->newauthtok, + rp, kr->pd->newauthtok_size); } *io_buf = buf; diff --git a/server/providers/krb5/krb5_child.c b/server/providers/krb5/krb5_child.c index 645274b3..5e185940 100644 --- a/server/providers/krb5/krb5_child.c +++ b/server/providers/krb5/krb5_child.c @@ -261,27 +261,16 @@ static errno_t pack_response_packet(struct response *resp, int status, int type, size_t len, const uint8_t *data) { int p=0; - int32_t c; if ((3*sizeof(int32_t) + len +1) > resp->max_size) { DEBUG(1, ("response message too big.\n")); return ENOMEM; } - c = status; - memcpy(&resp->buf[p], &c, sizeof(int32_t)); - p += sizeof(int32_t); - - c = type; - memcpy(&resp->buf[p], &c, sizeof(int32_t)); - p += sizeof(int32_t); - - c = len; - memcpy(&resp->buf[p], &c, sizeof(int32_t)); - p += sizeof(int32_t); - - memcpy(&resp->buf[p], data, len); - p += len; + COPY_INT32_VALUE(&resp->buf[p], status, p); + COPY_INT32_VALUE(&resp->buf[p], type, p); + COPY_INT32_VALUE(&resp->buf[p], len, p); + COPY_MEM(&resp->buf[p], data, p, len); resp->size = p; @@ -740,57 +729,31 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, struct pam_data *pd, size_t p = 0; uint32_t len; - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&pd->cmd, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&pd->pw_uid, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&pd->gr_gid, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(validate, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(offline, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&len, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); + COPY_UINT32_CHECK(&pd->cmd, buf + p, p, size); + COPY_UINT32_CHECK(&pd->pw_uid, buf + p, p, size); + COPY_UINT32_CHECK(&pd->gr_gid, buf + p, p, size); + COPY_UINT32_CHECK(validate, buf + p, p, size); + COPY_UINT32_CHECK(offline, buf + p, p, size); + COPY_UINT32_CHECK(&len, buf + p, p, size); if ((p + len ) > size) return EINVAL; pd->upn = talloc_strndup(pd, (char *)(buf + p), len); if (pd->upn == NULL) return ENOMEM; p += len; - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&len, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - + COPY_UINT32_CHECK(&len, buf + p, p, size); if ((p + len ) > size) return EINVAL; *ccname = talloc_strndup(pd, (char *)(buf + p), len); if (*ccname == NULL) return ENOMEM; p += len; - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&len, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - + COPY_UINT32_CHECK(&len, buf + p, p, size); if ((p + len ) > size) return EINVAL; *keytab = talloc_strndup(pd, (char *)(buf + p), len); if (*keytab == NULL) return ENOMEM; p += len; - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&len, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); - + COPY_UINT32_CHECK(&len, buf + p, p, size); if ((p + len) > size) return EINVAL; pd->authtok = (uint8_t *)talloc_strndup(pd, (char *)(buf + p), len); if (pd->authtok == NULL) return ENOMEM; @@ -798,9 +761,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, struct pam_data *pd, p += len; if (pd->cmd == SSS_PAM_CHAUTHTOK) { - if ((p + sizeof(uint32_t)) > size) return EINVAL; - memcpy(&len, buf + p, sizeof(uint32_t)); - p += sizeof(uint32_t); + COPY_UINT32_CHECK(&len, buf + p, p, size); if ((p + len) > size) return EINVAL; pd->newauthtok = (uint8_t *)talloc_strndup(pd, (char *)(buf + p), len); |