bug fix to make sure to verify file permissions/ownership on files that actually exist

This commit is contained in:
Michael Rash 2012-08-31 23:00:45 -04:00
parent b567514a6c
commit dafcfbc488

View File

@ -558,14 +558,13 @@ show_last_command(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
#endif #endif
verify_file_perms_ownership(args_save_file);
if (get_save_file(args_save_file)) { if (get_save_file(args_save_file)) {
if ((args_file_ptr = fopen(args_save_file, "r")) == NULL) { if ((args_file_ptr = fopen(args_save_file, "r")) == NULL) {
fprintf(stderr, "Could not open args file: %s\n", fprintf(stderr, "Could not open args file: %s\n",
args_save_file); args_save_file);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
verify_file_perms_ownership(args_save_file);
if ((fgets(args_str, MAX_LINE_LEN, args_file_ptr)) != NULL) { if ((fgets(args_str, MAX_LINE_LEN, args_file_ptr)) != NULL) {
printf("Last fwknop client command line: %s", args_str); printf("Last fwknop client command line: %s", args_str);
} else { } else {
@ -603,14 +602,13 @@ run_last_args(fko_cli_options_t *options)
if (get_save_file(args_save_file)) if (get_save_file(args_save_file))
{ {
verify_file_perms_ownership(args_save_file);
if ((args_file_ptr = fopen(args_save_file, "r")) == NULL) if ((args_file_ptr = fopen(args_save_file, "r")) == NULL)
{ {
fprintf(stderr, "Could not open args file: %s\n", fprintf(stderr, "Could not open args file: %s\n",
args_save_file); args_save_file);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
verify_file_perms_ownership(args_save_file);
if ((fgets(args_str, MAX_LINE_LEN, args_file_ptr)) != NULL) if ((fgets(args_str, MAX_LINE_LEN, args_file_ptr)) != NULL)
{ {
args_str[MAX_LINE_LEN-1] = '\0'; args_str[MAX_LINE_LEN-1] = '\0';