You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

66 lines
2.4 KiB

  1. --- a/src/auth_des.c
  2. +++ b/src/auth_des.c
  3. @@ -396,7 +396,7 @@ authdes_validate(AUTH *auth, struct opaque_auth *rverf)
  4. /*
  5. * validate
  6. */
  7. - if (bcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
  8. + if (memcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
  9. sizeof(struct timeval)) != 0) {
  10. LIBTIRPC_DEBUG(1, ("authdes_validate: verifier mismatch"));
  11. return (FALSE);
  12. --- a/src/auth_time.c
  13. +++ b/src/auth_time.c
  14. @@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin)
  15. p_bytes[1] = (unsigned char)a[5] & 0x000000FF;
  16. sin->sin_family = AF_INET; /* always */
  17. - bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2);
  18. + memcpy((char *)&sin->sin_port, (char *)&p_bytes, 2);
  19. return (0);
  20. }
  21. --- a/src/crypt_client.c
  22. +++ b/src/crypt_client.c
  23. @@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms)
  24. des_crypt_1_arg.desbuf.desbuf_val = buf;
  25. des_crypt_1_arg.des_dir = dparms->des_dir;
  26. des_crypt_1_arg.des_mode = dparms->des_mode;
  27. - bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
  28. - bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
  29. + memcpy(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8);
  30. + memcpy(des_crypt_1_arg.des_key, dparms->des_key, 8);
  31. result_1 = des_crypt_1(&des_crypt_1_arg, clnt);
  32. if (result_1 == (desresp *) NULL) {
  33. @@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms)
  34. if (result_1->stat == DESERR_NONE ||
  35. result_1->stat == DESERR_NOHWDEVICE) {
  36. - bcopy(result_1->desbuf.desbuf_val, buf, len);
  37. - bcopy(result_1->des_ivec, dparms->des_ivec, 8);
  38. + memcpy(buf, result_1->desbuf.desbuf_val, len);
  39. + memcpy(dparms->des_ivec, result_1->des_ivec, 8);
  40. }
  41. clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1);
  42. --- a/src/svc_auth_des.c
  43. +++ b/src/svc_auth_des.c
  44. @@ -145,7 +145,7 @@ _svcauth_des(rqst, msg)
  45. return (AUTH_BADCRED);
  46. }
  47. cred->adc_fullname.name = area->area_netname;
  48. - bcopy((char *)ixdr, cred->adc_fullname.name,
  49. + memcpy(cred->adc_fullname.name, (char *)ixdr,
  50. (u_int)namelen);
  51. cred->adc_fullname.name[namelen] = 0;
  52. ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT);
  53. @@ -419,7 +419,7 @@ cache_spot(key, name, timestamp)
  54. if (cp->key.key.high == hi &&
  55. cp->key.key.low == key->key.low &&
  56. cp->rname != NULL &&
  57. - bcmp(cp->rname, name, strlen(name) + 1) == 0) {
  58. + memcmp(cp->rname, name, strlen(name) + 1) == 0) {
  59. if (BEFORE(timestamp, &cp->laststamp)) {
  60. svcauthdes_stats.ncachereplays++;
  61. return (-1); /* replay */