diff options
author | Andreas Schneider <asn@samba.org> | 2016-08-26 11:57:30 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2016-08-31 20:59:13 +0200 |
commit | 41172e27556f7fdd5519e19ff86a659aba446bd2 (patch) | |
tree | 52045bc5fdc018bee70a6fee9d303d5ab62b4e66 | |
parent | e8632e2af50588dd47dc00fb72e85a398c844622 (diff) | |
download | samba-41172e27556f7fdd5519e19ff86a659aba446bd2.tar.gz |
krb5_wrap: Rename krb5_copy_data_contents()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 13 | ||||
-rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 6 | ||||
-rw-r--r-- | source4/kdc/db-glue.c | 12 | ||||
-rw-r--r-- | source4/kdc/pac-glue.c | 24 | ||||
-rw-r--r-- | source4/kdc/sdb_to_hdb.c | 8 | ||||
-rw-r--r-- | source4/kdc/wdc-samba4.c | 6 |
6 files changed, 34 insertions, 35 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index b8c1d634ec2..c636fb031b7 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -836,10 +836,9 @@ void smb_krb5_free_data_contents(krb5_context context, krb5_data *pdata) * * Caller has to free krb5_data with smb_krb5_free_data_contents(). */ - -krb5_error_code krb5_copy_data_contents(krb5_data *p, - const void *data, - size_t len) +krb5_error_code smb_krb5_copy_data_contents(krb5_data *p, + const void *data, + size_t len) { #if defined(HAVE_KRB5_DATA_COPY) return krb5_data_copy(p, data, len); @@ -2789,9 +2788,9 @@ krb5_error_code smb_krb5_principal_set_realm(krb5_context context, old_data = krb5_princ_realm(context, principal); - ret = krb5_copy_data_contents(&data, - realm, - strlen(realm)); + ret = smb_krb5_copy_data_contents(&data, + realm, + strlen(realm)); if (ret) { return ret; } diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index e28bb73974b..78406310c0b 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -388,9 +388,9 @@ char *smb_krb5_principal_get_comp_string(TALLOC_CTX *mem_ctx, krb5_const_principal principal, unsigned int component); -krb5_error_code krb5_copy_data_contents(krb5_data *p, - const void *data, - size_t len); +krb5_error_code smb_krb5_copy_data_contents(krb5_data *p, + const void *data, + size_t len); int smb_krb5_principal_get_type(krb5_context context, krb5_const_principal principal); diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index 5884607799e..91c34a2eded 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -498,9 +498,9 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context, key.salt->type = KRB5_PW_SALT; - ret = krb5_copy_data_contents(&key.salt->salt, - salt.data, - salt.length); + ret = smb_krb5_copy_data_contents(&key.salt->salt, + salt.data, + salt.length); if (ret) { free(key.salt); key.salt = NULL; @@ -556,9 +556,9 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context, key.salt->type = KRB5_PW_SALT; - ret = krb5_copy_data_contents(&key.salt->salt, - salt.data, - salt.length); + ret = smb_krb5_copy_data_contents(&key.salt->salt, + salt.data, + salt.length); if (ret) { free(key.salt); key.salt = NULL; diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index b232f6a29f0..99140fc7f0b 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -432,18 +432,18 @@ krb5_error_code samba_make_krb5_pac(krb5_context context, return 0; } - ret = krb5_copy_data_contents(&logon_data, - logon_blob->data, - logon_blob->length); + ret = smb_krb5_copy_data_contents(&logon_data, + logon_blob->data, + logon_blob->length); if (ret != 0) { return ret; } ZERO_STRUCT(cred_data); if (cred_blob != NULL) { - ret = krb5_copy_data_contents(&cred_data, - cred_blob->data, - cred_blob->length); + ret = smb_krb5_copy_data_contents(&cred_data, + cred_blob->data, + cred_blob->length); if (ret != 0) { smb_krb5_free_data_contents(context, &logon_data); return ret; @@ -452,9 +452,9 @@ krb5_error_code samba_make_krb5_pac(krb5_context context, ZERO_STRUCT(upn_data); if (upn_blob != NULL) { - ret = krb5_copy_data_contents(&upn_data, - upn_blob->data, - upn_blob->length); + ret = smb_krb5_copy_data_contents(&upn_data, + upn_blob->data, + upn_blob->length); if (ret != 0) { smb_krb5_free_data_contents(context, &logon_data); smb_krb5_free_data_contents(context, &cred_data); @@ -464,9 +464,9 @@ krb5_error_code samba_make_krb5_pac(krb5_context context, ZERO_STRUCT(deleg_data); if (deleg_blob != NULL) { - ret = krb5_copy_data_contents(&deleg_data, - deleg_blob->data, - deleg_blob->length); + ret = smb_krb5_copy_data_contents(&deleg_data, + deleg_blob->data, + deleg_blob->length); if (ret != 0) { smb_krb5_free_data_contents(context, &logon_data); smb_krb5_free_data_contents(context, &cred_data); diff --git a/source4/kdc/sdb_to_hdb.c b/source4/kdc/sdb_to_hdb.c index 7ac0b0e4d5a..7ec4046acdc 100644 --- a/source4/kdc/sdb_to_hdb.c +++ b/source4/kdc/sdb_to_hdb.c @@ -72,7 +72,7 @@ static int sdb_salt_to_Salt(const struct sdb_salt *s, Salt *h) int ret; h->type = s->type; - ret = krb5_copy_data_contents(&h->salt, s->salt.data, s->salt.length); + ret = smb_krb5_copy_data_contents(&h->salt, s->salt.data, s->salt.length); if (ret != 0) { free_Salt(h); return ENOMEM; @@ -97,9 +97,9 @@ static int sdb_key_to_Key(const struct sdb_key *s, Key *h) } h->key.keytype = s->key.keytype; - rc = krb5_copy_data_contents(&h->key.keyvalue, - s->key.keyvalue.data, - s->key.keyvalue.length); + rc = smb_krb5_copy_data_contents(&h->key.keyvalue, + s->key.keyvalue.data, + s->key.keyvalue.length); if (rc != 0) { goto error_nomem; } diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index 0b1573472c6..b90578c8508 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -429,9 +429,9 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, krb5_context context, } if (type_blob.length != 0) { - ret = krb5_copy_data_contents(&type_data, - type_blob.data, - type_blob.length); + ret = smb_krb5_copy_data_contents(&type_data, + type_blob.data, + type_blob.length); if (ret != 0) { SAFE_FREE(types); krb5_pac_free(context, new_pac); |