diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1997-07-17 16:35:19 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1997-07-17 16:35:19 +0000 |
| commit | df3e66ffad4900ec512dc389155096263462e006 (patch) | |
| tree | cd177c24b7a46bbd6da2a0cb9461da0602879164 /src/kadmin | |
| parent | b3b6d6830f62746777f6e6e480f02f111f472b06 (diff) | |
* dump.c (process_k5beta_record): Change variables from char to
krb5_octet to match types in krb5_key_data.
* ovload.c (process_ov_principal): Change "more" variable to
krb5_boolean as argument to krb5_db_get_principal.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10120 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 8 | ||||
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 8 | ||||
| -rw-r--r-- | src/kadmin/dbutil/ovload.c | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 803d5deb5..92b0c7fb0 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 17 12:25:41 1997 Ezra Peisach <epeisach@mit.edu> + + * dump.c (process_k5beta_record): Change variables from char to + krb5_octet to match types in krb5_key_data. + + * ovload.c (process_ov_principal): Change "more" variable to + krb5_boolean as argument to krb5_db_get_principal. + Wed Mar 12 01:19:51 1997 Theodore Y. Ts'o <tytso@mit.edu> * loadv4.c (argv): Check to see if the global_param's stash file diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 8d9574670..3a65640fb 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -1262,8 +1262,8 @@ process_k5beta_record(fname, kcontext, filep, verbose, linenop, pol_db) /* this really does look like an old key, so drop and swap */ /* the *new* length is 2 bytes, LSB first, sigh. */ size_t shortlen = pkey->key_data_length[0]-4+2; - char *shortcopy = (krb5_octet *) malloc(shortlen); - char *origdata = pkey->key_data_contents[0]; + krb5_octet *shortcopy = (krb5_octet *) malloc(shortlen); + krb5_octet *origdata = pkey->key_data_contents[0]; shortcopy[0] = origdata[3]; shortcopy[1] = origdata[2]; memcpy(shortcopy+2,origdata+4,shortlen-2); @@ -1332,8 +1332,8 @@ process_k5beta_record(fname, kcontext, filep, verbose, linenop, pol_db) /* this really does look like an old key, so drop and swap */ /* the *new* length is 2 bytes, LSB first, sigh. */ size_t shortlen = akey->key_data_length[0]-4+2; - char *shortcopy = (krb5_octet *) malloc(shortlen); - char *origdata = akey->key_data_contents[0]; + krb5_octet *shortcopy = (krb5_octet *) malloc(shortlen); + krb5_octet *origdata = akey->key_data_contents[0]; shortcopy[0] = origdata[3]; shortcopy[1] = origdata[2]; memcpy(shortcopy+2,origdata+4,shortlen-2); diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c index a57dece95..4e2d09b56 100644 --- a/src/kadmin/dbutil/ovload.c +++ b/src/kadmin/dbutil/ovload.c @@ -106,7 +106,8 @@ int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db) krb5_db_entry kdb; char *current; char *cp; - int tmp, x, i, one, more; + int tmp, x, i, one; + krb5_boolean more; char line[LINESIZE]; if (fgets(line, LINESIZE, filep) == (char *) NULL) { @@ -180,7 +181,7 @@ int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db) 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); one = 1; ret = krb5_db_get_principal(kcontext, princ, &kdb, &one, |