From 0a990b0dabda39902a3359660a417d814026e2f1 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 3 Apr 2004 01:37:56 +0000 Subject: [PATCH] * t_kdb.c (add_principal): Delete unused argument 'rseed'. (do_testing): Update callers. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16230 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/ChangeLog | 3 +++ src/lib/kdb/t_kdb.c | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 84bc49e45..90e5f7379 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,5 +1,8 @@ 2004-04-02 Ken Raeburn + * t_kdb.c (add_principal): Delete unused argument 'rseed'. + (do_testing): Update callers. + * keytab.c (krb5_ktkdb_get_entry): Don't use local variable "context" until after it's been set. diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c index ddb825848..769d3e68b 100644 --- a/src/lib/kdb/t_kdb.c +++ b/src/lib/kdb/t_kdb.c @@ -276,12 +276,11 @@ principal_found(nvalid, pname) * Add a principal to the database. */ static krb5_error_code -add_principal(kcontext, principal, mkey, key, rseed) +add_principal(kcontext, principal, mkey, key) krb5_context kcontext; krb5_principal principal; krb5_keyblock * mkey; krb5_keyblock * key; - krb5_pointer rseed; { krb5_error_code kret; krb5_db_entry dbent; @@ -585,8 +584,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, if ((kret = add_principal(kcontext, master_princ, &master_keyblock, - &master_keyblock, - rseed))) + &master_keyblock))) goto goodbye; @@ -648,7 +646,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, swatch_on(); } if ((kret = add_principal(kcontext, playback_principal(passno), - &master_keyblock, kbp, rseed))) { + &master_keyblock, kbp))) { linkage = "initially "; oparg = playback_name(passno); goto cya; @@ -679,8 +677,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, } if ((kret = add_principal(kcontext, playback_principal(nvalid), - &master_keyblock, - kbp, rseed))) { + &master_keyblock, kbp))) { oparg = playback_name(nvalid); goto cya; } @@ -809,7 +806,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, for (passno=0; passno 4) fprintf(stderr, "*A(%s)\n", playback_name(passno)); @@ -909,8 +906,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, if ((kret = add_principal(ccontext, playback_principal(base+j), &master_keyblock, - &stat_kb, - rseed))) { + &stat_kb))) { fprintf(stderr, "%ld: (%d,%d) Failed add of %s with %s\n", (long) getpid(), i, j, playback_name(base+j), -- 2.26.2