diff options
Diffstat (limited to 'src/lib/kadm5/srv')
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.c | 2 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_kdb.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 13 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c index 7094f49..b2aeb7d 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -112,7 +112,7 @@ kadm5int_acl_get_line(fp, lnp) line_incr = 0; for (domore = 1; domore && !feof(fp); ) { /* Copy in the line, with continuations */ - for (i=0; ((i < sizeof acl_buf) && !feof(fp)); i++ ) { + for (i = 0; ((i < BUFSIZ) && !feof(fp)); i++) { int byte; byte = fgetc(fp); acl_buf[i] = byte; diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c index f4217dd..2366144 100644 --- a/src/lib/kadm5/srv/server_kdb.c +++ b/src/lib/kadm5/srv/server_kdb.c @@ -282,7 +282,7 @@ kdb_get_entry(kadm5_server_handle_t handle, return(ret); } - xdrmem_create(&xdrs, tl_data.tl_data_contents, + xdrmem_create(&xdrs, (caddr_t)tl_data.tl_data_contents, tl_data.tl_data_length, XDR_DECODE); if (! xdr_osa_princ_ent_rec(&xdrs, adb)) { xdr_destroy(&xdrs); @@ -373,7 +373,7 @@ kdb_put_entry(kadm5_server_handle_t handle, } tl_data.tl_data_type = KRB5_TL_KADM_DATA; tl_data.tl_data_length = xdr_getpos(&xdrs); - tl_data.tl_data_contents = xdralloc_getdata(&xdrs); + tl_data.tl_data_contents = (krb5_octet *)xdralloc_getdata(&xdrs); ret = krb5_dbe_update_tl_data(handle->context, kdb, &tl_data); diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 6d90628..6c7a2c0 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -245,10 +245,12 @@ apply_keysalt_policy(kadm5_server_handle_t handle, const char *policy, ks_tuple = handle->params.keysalts; } /* Dup the requested or defaulted keysalt tuples. */ - new_ks_tuple = k5memdup(ks_tuple, n_ks_tuple * sizeof(*new_ks_tuple), - &ret); - if (new_ks_tuple == NULL) + new_ks_tuple = malloc(n_ks_tuple * sizeof(*new_ks_tuple)); + if (new_ks_tuple == NULL) { + ret = ENOMEM; goto cleanup; + } + memcpy(new_ks_tuple, ks_tuple, n_ks_tuple * sizeof(*new_ks_tuple)); new_n_ks_tuple = n_ks_tuple; ret = 0; goto cleanup; @@ -363,7 +365,7 @@ kadm5_create_principal_3(void *server_handle, kadm5_policy_ent_rec polent; krb5_boolean have_polent = FALSE; krb5_int32 now; - krb5_tl_data *tl_data_orig, *tl_data_tail; + krb5_tl_data *tl_data_tail; unsigned int ret; kadm5_server_handle_t handle = server_handle; krb5_keyblock *act_mkey; @@ -487,7 +489,6 @@ kadm5_create_principal_3(void *server_handle, if (mask & KADM5_TL_DATA) { /* splice entry->tl_data onto the front of kdb->tl_data */ - tl_data_orig = kdb->tl_data; for (tl_data_tail = entry->tl_data; tl_data_tail; tl_data_tail = tl_data_tail->tl_data_next) { @@ -1265,6 +1266,8 @@ kadm5_use_password_server (void) } #endif +void kadm5_set_use_password_server (void); + void kadm5_set_use_password_server (void) { |