diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-12-19 22:30:07 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-12-19 22:30:07 +0000 |
| commit | 48d9b92c5607e18e30ce1f0c0f0ad73a4f75e5ee (patch) | |
| tree | 482cecbd24e98f2ed54f22398e303207ec99733a | |
| parent | eef6e093407b6f5c07fff447396e074001a29556 (diff) | |
| download | krb5-48d9b92c5607e18e30ce1f0c0f0ad73a4f75e5ee.tar.gz krb5-48d9b92c5607e18e30ce1f0c0f0ad73a4f75e5ee.tar.xz krb5-48d9b92c5607e18e30ce1f0c0f0ad73a4f75e5ee.zip | |
Don't use vsyslog; use syslog instead. Fixed lint flames
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7237 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin.old/server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin.old/server/adm_server.c | 25 |
2 files changed, 19 insertions, 11 deletions
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog index 0e0db1cfdf..988b232196 100644 --- a/src/kadmin.old/server/ChangeLog +++ b/src/kadmin.old/server/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 19 17:24:13 1995 Theodore Y. Ts'o <tytso@dcl> + + * adm_server.c (kdc_com_err_proc): Don't use vsyslog; use syslog + instead. Fixed lint flames. + Wed Dec 13 03:51:53 1995 Chris Provenzano (proven@mit.edu) * adm_funcs.c : Remove mkvno for krb5_db_entry diff --git a/src/kadmin.old/server/adm_server.c b/src/kadmin.old/server/adm_server.c index c704c39b58..938bd843fa 100644 --- a/src/kadmin.old/server/adm_server.c +++ b/src/kadmin.old/server/adm_server.c @@ -244,9 +244,9 @@ process_args(context, argc, argv) /* initialize random key generators */ for (ktype = 0; ktype <= krb5_max_enctype; ktype++) { if (krb5_enctype_array[ktype]) { - if (retval = (*krb5_enctype_array[ktype]->system-> - init_random_key)(&master_keyblock, - &krb5_enctype_array[ktype]->random_sequence)) { + if ((retval = (*krb5_enctype_array[ktype]->system-> + init_random_key)(&master_keyblock, + &krb5_enctype_array[ktype]->random_sequence))) { com_err(argv[0], retval, "while setting up random key generator for ktype %d--ktype disabled", ktype); @@ -354,12 +354,12 @@ init_db(context, dbname, masterkeyname, masterkeyblock) convert server.key into a real key (it may be encrypted in the database) */ - if (retval = krb5_dbe_find_enctype(context, - &server_entry, - ENCTYPE_DES_CBC_MD5, - -1, - -1, - &kdatap)) { + if ((retval = krb5_dbe_find_enctype(context, + &server_entry, + ENCTYPE_DES_CBC_MD5, + -1, + -1, + &kdatap))) { krb5_db_free_principal(context, &server_entry, number_of_entries); (void) krb5_finish_key(context, &master_encblock); memset((char *)&master_encblock, 0, sizeof(master_encblock)); @@ -409,6 +409,7 @@ kdc_com_err_proc(whoami, code, format, pvar) #ifndef __STDC__ extern int vfprintf(); #endif + char tbuf[1024]; if (whoami) { fputs(whoami, stderr); @@ -438,10 +439,12 @@ kdc_com_err_proc(whoami, code, format, pvar) strcpy(nfmt, error_message(code)); strcat(nfmt, " "); strcat(nfmt, format); - vsyslog(LOG_ERR, nfmt, pvar); + vsprintf(tbuf, nfmt, pvar); + syslog(LOG_ERR, tbuf); free(nfmt); } else { - vsyslog(LOG_ERR, format, pvar); + vsprintf(tbuf, format, pvar); + syslog(LOG_ERR, tbuf); } } else { if (code) { |