diff options
Diffstat (limited to 'src/kadmin/client/kadmin_cpw.c')
| -rw-r--r-- | src/kadmin/client/kadmin_cpw.c | 60 |
1 files changed, 14 insertions, 46 deletions
diff --git a/src/kadmin/client/kadmin_cpw.c b/src/kadmin/client/kadmin_cpw.c index 194e0f98b4..34d39acba4 100644 --- a/src/kadmin/client/kadmin_cpw.c +++ b/src/kadmin/client/kadmin_cpw.c @@ -27,24 +27,21 @@ #include <netdb.h> #include <signal.h> #include <string.h> -#include "com_err.h" +#include <com_err.h> #include <sys/param.h> -#include "k5-int.h" +#include <k5-int.h> void decode_kadmind_reply(); int print_status_message(); krb5_error_code -kadm_cpw_user(context, my_creds, rep_ret, local_addr, foreign_addr, - local_socket, seqno, oper_type, principal) +kadm_cpw_user(context, auth_context, my_creds, + local_socket, oper_type, 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; int oper_type; char *principal; { @@ -54,6 +51,7 @@ kadm_cpw_user(context, my_creds, rep_ret, local_addr, foreign_addr, char *password; int pwsize; int count; + krb5_replay_data replaydata; krb5_error_code retval; /* return code */ if ((inbuf.data = (char *) calloc(1, 3 + sizeof(username))) == (char *) 0) { fprintf(stderr, "No memory for command!\n"); @@ -90,16 +88,8 @@ kadm_cpw_user(context, my_creds, rep_ret, local_addr, foreign_addr, inbuf.length = strlen(username) + 3; /* Transmit Principal Name */ - 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); @@ -121,15 +111,8 @@ kadm_cpw_user(context, my_creds, rep_ret, local_addr, foreign_addr, return(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 Second Read Decoding :%s!\n", error_message(retval)); free(inbuf.data); @@ -219,16 +202,8 @@ kadm_cpw_user(context, my_creds, rep_ret, local_addr, foreign_addr, #endif /* MACH_PASS */ - 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); @@ -250,15 +225,8 @@ kadm_cpw_user(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); |