mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +00:00
more ast_copy_string conversions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -217,9 +217,9 @@ static struct ast_key *try_load_key (char *dir, char *fname, int ifd, int ofd, i
|
||||
if (found)
|
||||
ast_mutex_lock(&keylock);
|
||||
/* First the filename */
|
||||
strncpy(key->fn, ffname, sizeof(key->fn) - 1);
|
||||
ast_copy_string(key->fn, ffname, sizeof(key->fn));
|
||||
/* Then the name */
|
||||
strncpy(key->name, fname, sizeof(key->name) - 1);
|
||||
ast_copy_string(key->name, fname, sizeof(key->name));
|
||||
key->ktype = ktype;
|
||||
/* Yes, assume we're going to be deleted */
|
||||
key->delme = 1;
|
||||
@@ -529,7 +529,7 @@ static int init_keys(int fd, int argc, char *argv[])
|
||||
/* Reload keys that need pass codes now */
|
||||
if (key->ktype & KEY_NEEDS_PASSCODE) {
|
||||
kn = key->fn + strlen(ast_config_AST_KEY_DIR) + 1;
|
||||
strncpy(tmp, kn, sizeof(tmp) - 1);
|
||||
ast_copy_string(tmp, kn, sizeof(tmp));
|
||||
try_load_key((char *)ast_config_AST_KEY_DIR, tmp, fd, fd, &ign);
|
||||
}
|
||||
key = key->next;
|
||||
|
Reference in New Issue
Block a user