From feac8c422b0238b9ba8d69c2e610b86614f5a4af Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Sat, 12 Sep 2020 14:27:01 +0200 Subject: print errors to stderr and prefix them consistently --- src/firejail/profile.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/firejail/profile.c b/src/firejail/profile.c index f6ef934db..e010d968d 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c @@ -461,7 +461,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-user.see ", 14) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 14)) { - printf("Invalid dbus-user.see name: %s\n", ptr + 15); + fprintf(stderr, "Invalid dbus-user.see name: %s\n", ptr + 15); exit(1); } #endif @@ -470,7 +470,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-user.talk ", 15) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 15)) { - printf("Invalid dbus-user.talk name: %s\n", ptr + 15); + fprintf(stderr, "Error: Invalid dbus-user.talk name: %s\n", ptr + 15); exit(1); } #endif @@ -479,7 +479,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-user.own ", 14) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 14)) { - fprintf(stderr, "Invalid dbus-user.own name: %s\n", ptr + 14); + fprintf(stderr, "Error: Invalid dbus-user.own name: %s\n", ptr + 14); exit(1); } #endif @@ -488,7 +488,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-user.call ", 15) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_call_rule(ptr + 15)) { - fprintf(stderr, "Invalid dbus-user.call rule: %s\n", ptr + 15); + fprintf(stderr, "Error: Invalid dbus-user.call rule: %s\n", ptr + 15); exit(1); } #endif @@ -497,7 +497,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-user.broadcast ", 20) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_call_rule(ptr + 20)) { - fprintf(stderr, "Invalid dbus-user.broadcast rule: %s\n", ptr + 20); + fprintf(stderr, "Error: Invalid dbus-user.broadcast rule: %s\n", ptr + 20); exit(1); } #endif @@ -519,7 +519,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { } arg_dbus_system = DBUS_POLICY_BLOCK; } else { - fprintf(stderr, "Unknown dbus-system policy: %s\n", ptr); + fprintf(stderr, "Error: Unknown dbus-system policy: %s\n", ptr); exit(1); } #endif @@ -528,7 +528,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-system.see ", 16) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 16)) { - fprintf(stderr, "Invalid dbus-system.see name: %s\n", ptr + 17); + fprintf(stderr, "Error: Invalid dbus-system.see name: %s\n", ptr + 17); exit(1); } #endif @@ -537,7 +537,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-system.talk ", 17) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 17)) { - fprintf(stderr, "Invalid dbus-system.talk name: %s\n", ptr + 17); + fprintf(stderr, "Error: Invalid dbus-system.talk name: %s\n", ptr + 17); exit(1); } #endif @@ -546,7 +546,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-system.own ", 16) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_name(ptr + 16)) { - fprintf(stderr, "Invalid dbus-system.own name: %s\n", ptr + 16); + fprintf(stderr, "Error: Invalid dbus-system.own name: %s\n", ptr + 16); exit(1); } #endif @@ -555,7 +555,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-system.call ", 17) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_call_rule(ptr + 17)) { - fprintf(stderr, "Invalid dbus-system.call rule: %s\n", ptr + 17); + fprintf(stderr, "Error: Invalid dbus-system.call rule: %s\n", ptr + 17); exit(1); } #endif @@ -564,7 +564,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { else if (strncmp(ptr, "dbus-system.broadcast ", 22) == 0) { #ifdef HAVE_DBUSPROXY if (!dbus_check_call_rule(ptr + 22)) { - fprintf(stderr, "Invalid dbus-system.broadcast rule: %s\n", ptr + 22); + fprintf(stderr, "Error: Invalid dbus-system.broadcast rule: %s\n", ptr + 22); exit(1); } #endif @@ -1472,7 +1472,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { arg_rlimit_as = 1; } else { - fprintf(stderr, "Invalid rlimit option on line %d\n", lineno); + fprintf(stderr, "Error: Invalid rlimit option on line %d\n", lineno); exit(1); } -- cgit v1.2.3-70-g09d2