diff options
author | Ken Raeburn <raeburn@mit.edu> | 2007-07-12 23:34:21 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2007-07-12 23:34:21 +0000 |
commit | 26ac11d6e59847a0ad1c30019f85abec23220a5d (patch) | |
tree | 588f2df023eec962ce090e08486cb8dfda08f2de /src/plugins/kdb | |
parent | b06170f99a8f869b3ac1c3832d44c09d0f59e70f (diff) | |
download | krb5-26ac11d6e59847a0ad1c30019f85abec23220a5d.tar.gz krb5-26ac11d6e59847a0ad1c30019f85abec23220a5d.tar.xz krb5-26ac11d6e59847a0ad1c30019f85abec23220a5d.zip |
Avoid unchecked sprintf in some KDC-side programs
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19705 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins/kdb')
-rw-r--r-- | src/plugins/kdb/db2/kdb_db2.c | 23 | ||||
-rw-r--r-- | src/plugins/kdb/db2/libdb2/btree/bt_open.c | 3 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c index d438171cb..bce659751 100644 --- a/src/plugins/kdb/db2/kdb_db2.c +++ b/src/plugins/kdb/db2/kdb_db2.c @@ -337,9 +337,11 @@ krb5_db2_db_init(krb5_context context) if ((retval = krb5_db2_db_get_age(context, NULL, &db_ctx->db_lf_time))) goto err_out; - sprintf(policy_db_name, db_ctx->tempdb ? "%s~.kadm5" : "%s.kadm5", - db_ctx->db_name); - sprintf(policy_lock_name, "%s.lock", policy_db_name); + snprintf(policy_db_name, sizeof(policy_db_name), + db_ctx->tempdb ? "%s~.kadm5" : "%s.kadm5", + db_ctx->db_name); + snprintf(policy_lock_name, sizeof(policy_lock_name), + "%s.lock", policy_db_name); if ((retval = osa_adb_init_db(&db_ctx->policy_db, policy_db_name, policy_lock_name, OSA_ADB_POLICY_DB_MAGIC))) @@ -720,8 +722,9 @@ krb5_db2_db_create(krb5_context context, char *db_name, krb5_int32 flags) free_dbsuffix(okname); } - sprintf(policy_db_name, "%s.kadm5", db_name2); - sprintf(policy_lock_name, "%s.lock", policy_db_name); + snprintf(policy_db_name, sizeof(policy_db_name), "%s.kadm5", db_name2); + snprintf(policy_lock_name, sizeof(policy_lock_name), + "%s.lock", policy_db_name); retval = osa_adb_create_db(policy_db_name, policy_lock_name, OSA_ADB_POLICY_DB_MAGIC); @@ -851,8 +854,9 @@ krb5_db2_db_destroy(krb5_context context, char *dbname) if (retval1 || retval2) return (retval1 ? retval1 : retval2); - sprintf(policy_db_name, "%s.kadm5", dbname); - sprintf(policy_lock_name, "%s.lock", policy_db_name); + snprintf(policy_db_name, sizeof(policy_db_name), "%s.kadm5", dbname); + snprintf(policy_lock_name, sizeof(policy_lock_name), + "%s.lock", policy_db_name); retval1 = osa_adb_destroy_db(policy_db_name, policy_lock_name, OSA_ADB_POLICY_DB_MAGIC); @@ -1694,8 +1698,9 @@ krb5_db2_db_rename(context, from, to) now. */ char policy[2048], new_policy[2048]; assert (strlen(db_ctx->db_name) < 2000); - sprintf(policy, "%s.kadm5", db_ctx->db_name); - sprintf(new_policy, "%s~.kadm5", db_ctx->db_name); + snprintf(policy, sizeof(policy), "%s.kadm5", db_ctx->db_name); + snprintf(new_policy, sizeof(new_policy), + "%s~.kadm5", db_ctx->db_name); if (0 != rename(new_policy, policy)) { retval = errno; goto errout; diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c index dbdaff9e0..a18eef2cf 100644 --- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c +++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c @@ -414,7 +414,8 @@ tmp() if (envtmp && ((strlen(envtmp)+sizeof(fn)+1) > sizeof(path))) return(-1); - (void)sprintf(path, "%s%s", (envtmp ? envtmp : "/tmp"), fn); + (void)snprintf(path, sizeof(path), + "%s%s", (envtmp ? envtmp : "/tmp"), fn); #ifdef SIG_BLOCK (void)sigfillset(&set); |