[v4,1/2] Revert "timezone: Fix compare_file comparison in timezone checking"
diff mbox series

Message ID 20250605080336.21824-1-andrea.ricchi@amarulasolutions.com
State New
Headers show
Series
  • [v4,1/2] Revert "timezone: Fix compare_file comparison in timezone checking"
Related show

Commit Message

Andrea Ricchi June 5, 2025, 8:03 a.m. UTC 
This reverts commit f20ccd19a62bd01aa117bfc8e7c388d2a16cde05.

`compare_file` is intended to work with symlinks, enabling
full and accurate matching between the requested timezone and the zoneinfo
database.
---
 src/timezone.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

'Marko, Peter' via Amarula Linux June 5, 2025, 3 p.m. UTC | #1 
Hello:

This series was applied to connman.git (master)
by Denis Kenzior <denkenz@gmail.com>:

On Thu,  5 Jun 2025 10:03:35 +0200 you wrote:
> This reverts commit f20ccd19a62bd01aa117bfc8e7c388d2a16cde05.
> 
> `compare_file` is intended to work with symlinks, enabling
> full and accurate matching between the requested timezone and the zoneinfo
> database.
> ---
>  src/timezone.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
  - [v4,1/2] Revert "timezone: Fix compare_file comparison in timezone checking"
    https://git.kernel.org/pub/scm/network/connman/connman.git/?id=3da91cef1c1f
  - [v4,2/2] timezone: Replace Localtime file copy with symbolic link
    (no matching commit)

You are awesome, thank you!

Patch
diff mbox series 

diff --git a/src/timezone.c b/src/timezone.c
index fba8b925..89c44895 100644
--- a/src/timezone.c
+++ b/src/timezone.c
@@ -124,8 +124,8 @@  static int compare_file(void *src_map, struct stat *src_st,
 
 	DBG("real path %s path name %s", real_path, pathname);
 
-	if (real_path && !g_strcmp0(real_path, pathname))
-		return 0;
+	if (real_path && g_strcmp0(real_path, pathname))
+		return -1;
 
 	fd = open(pathname, O_RDONLY | O_CLOEXEC);
 	if (fd < 0)