diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-15 23:34:29 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-15 23:34:29 +0000 |
| commit | e5aa226db5b0864acbe2f3e0c8c30a26c6ff7a6d (patch) | |
| tree | afe5ebd64c8eaf401c11229a5d72e3fd500b8a83 /src | |
| parent | af3d24d52ff3bcf060ebdb9b7565dd32f785c8e6 (diff) | |
step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3819 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/krb524/conv_creds.c | 8 | ||||
| -rw-r--r-- | src/krb524/encode.c | 4 | ||||
| -rw-r--r-- | src/krb524/krb524d.c | 2 | ||||
| -rw-r--r-- | src/krb524/test.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c index 598384a17..1ccadf0ba 100644 --- a/src/krb524/conv_creds.c +++ b/src/krb524/conv_creds.c @@ -86,8 +86,8 @@ int krb524_convert_creds_plain(krb5_creds *v5creds, CREDENTIALS *v4creds) sizeof(C_Block)); return KRB524_BADKEY; } else - bcopy((char *) v5creds->keyblock.contents, v4creds->session, - sizeof(C_Block)); + memcpy(v4creds->session, (char *) v5creds->keyblock.contents, + sizeof(C_Block)); /* V4 has no concept of authtime or renew_till, so ignore them */ /* V4 lifetime is 1 byte, in 5 minute increments */ @@ -105,8 +105,8 @@ int krb524_convert_creds_plain(krb5_creds *v5creds, CREDENTIALS *v4creds) fprintf(stderr, "Invalid v5creds address information.\n"); return KRB524_BADADDR; } else - bcopy(v5creds->addresses[0]->contents, (char *) &addr, - sizeof(addr)); + memcpy((char *) &addr, v5creds->addresses[0]->contents, + sizeof(addr)); return 0; } diff --git a/src/krb524/encode.c b/src/krb524/encode.c index 91c6fba6d..5a655433d 100644 --- a/src/krb524/encode.c +++ b/src/krb524/encode.c @@ -47,7 +47,7 @@ int encode_bytes(char **out, int *outlen, char *in, int len) { if (len > *outlen) return KRB524_ENCFULL; - bcopy(in, *out, len); + memcpy(*out, in, len); *out += len; *outlen -= len; return 0; @@ -85,7 +85,7 @@ int decode_bytes(char **out, int *outlen, char *in, int len) { if (len > *outlen) return KRB524_DECEMPTY; - bcopy(*out, in, len); + memcpy(in, *out, len); *out += len; *outlen -= len; return 0; diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 2460ab5f3..3bb341936 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -327,7 +327,7 @@ krb5_error_code lookup_service_key(krb5_principal p, krb5_keyblock *key) if (use_keytab) { if (ret = krb5_kt_get_entry(kt, p, 0, &entry)) return ret; - bcopy((char *) &entry.key, key, sizeof(krb5_keyblock)); + memcpy(key, (char *) &entry.key, sizeof(krb5_keyblock)); return 0; } else if (use_master) { if (ret = krb5_dbm_db_init()) diff --git a/src/krb524/test.c b/src/krb524/test.c index 0aeccada5..917d35e72 100644 --- a/src/krb524/test.c +++ b/src/krb524/test.c @@ -278,8 +278,8 @@ void do_remote(krb5_creds *v5creds, char *server, krb5_keyblock *key) } memset((char *) &saddr, 0, sizeof(struct sockaddr_in)); saddr.sin_family = AF_INET; - bcopy(hp->h_addr, (char *) &saddr.sin_addr.s_addr, - sizeof(struct in_addr)); + memcpy((char *) &saddr.sin_addr.s_addr, hp->h_addr, + sizeof(struct in_addr)); if (ret = krb524_convert_creds_addr(v5creds, &v4creds, &saddr)) { com_err("test", ret, "converting credentials on %s", |