diff options
Diffstat (limited to 'src/kadmin/client/kadmin_adr.c')
| -rw-r--r-- | src/kadmin/client/kadmin_adr.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/src/kadmin/client/kadmin_adr.c b/src/kadmin/client/kadmin_adr.c index 7f9d75b0ea..52a8d3f73e 100644 --- a/src/kadmin/client/kadmin_adr.c +++ b/src/kadmin/client/kadmin_adr.c @@ -26,20 +26,20 @@ #include <netinet/in.h> #include <netdb.h> #include <string.h> -#include "com_err.h" +#include <com_err.h> + #include <sys/param.h> -#include "k5-int.h" + +#include <krb5.h> void decode_kadmind_reply(); int print_status_message(); krb5_error_code -kadm_add_user_rnd(context, my_creds, rep_ret, local_addr, foreign_addr, +kadm_add_user_rnd(context, auth_context, my_creds, local_socket, seqno, principal) krb5_context context; - krb5_creds *my_creds; - krb5_ap_rep_enc_part *rep_ret; - krb5_address *local_addr, *foreign_addr; + krb5_auth_context *auth_context; int *local_socket; krb5_int32 *seqno; char *principal; @@ -48,6 +48,7 @@ kadm_add_user_rnd(context, my_creds, rep_ret, local_addr, foreign_addr, kadmin_requests rd_priv_resp; char username[755]; int count; + krb5_replay_data replaydata; krb5_error_code retval; /* return code */ if ((inbuf.data = (char *) calloc(1, 3 + sizeof(username))) == (char *) 0) { @@ -83,16 +84,8 @@ kadm_add_user_rnd(context, my_creds, rep_ret, local_addr, foreign_addr, (void) memcpy( inbuf.data + 3, username, strlen(username)); inbuf.length = strlen(username) + 3; - if ((retval = krb5_mk_priv(context, &inbuf, - ETYPE_DES_CBC_CRC, - &my_creds->keyblock, - local_addr, - foreign_addr, - *seqno, - KRB5_PRIV_DOSEQUENCE|KRB5_PRIV_NOTIME, - 0, - 0, - &msg_data))) { + if ((retval = krb5_mk_priv(context, auth_context, &inbuf, + &msg_data, &replaydata))) { fprintf(stderr, "Error during Second Message Encoding: %s!\n", error_message(retval)); free(inbuf.data); @@ -115,15 +108,8 @@ kadm_add_user_rnd(context, my_creds, rep_ret, local_addr, foreign_addr, retval = 1; } - if ((retval = krb5_rd_priv(context, &inbuf, - &my_creds->keyblock, - foreign_addr, - local_addr, - rep_ret->seq_number, - KRB5_PRIV_DOSEQUENCE|KRB5_PRIV_NOTIME, - 0, - 0, - &msg_data))) { + if ((retval = krb5_rd_priv(context, auth_context, &inbuf, + &msg_data, &replaydata))) { fprintf(stderr, "Error during Final Read Decoding :%s!\n", error_message(retval)); free(inbuf.data); |