Merge pull request #32474 from poettering/varlink-no-pidfd

bluca · web-flow · commit 8e0bd955fea1 · 2024-04-25T17:27:18.000+02:00
varlink: tweak fallback for SO_PEERPIDFD on old kernels
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
@@ -167,7 +167,8 @@ static inline bool ERRNO_IS_NEG_NOT_SUPPORTED(intmax_t r) {
                       -EAFNOSUPPORT,
                       -EPFNOSUPPORT,
                       -EPROTONOSUPPORT,
-                      -ESOCKTNOSUPPORT);
+                      -ESOCKTNOSUPPORT,
+                      -ENOPROTOOPT);
 }
 _DEFINE_ABS_WRAPPER(NOT_SUPPORTED);
 
diff --git a/src/shared/varlink.c b/src/shared/varlink.c
@@ -2871,7 +2871,7 @@ int varlink_get_peer_pidref(Varlink *v, PidRef *ret) {
          * authentication. */
 
         r = varlink_acquire_pidfd(v);
-        if (r < 0)
+        if (r < 0 && !ERRNO_IS_NEG_NOT_SUPPORTED(r))
                 return r;
 
         if (v->peer_pidfd < 0) {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ static inline bool ERRNO_IS_NEG_NOT_SUPPORTED(intmax_t r) {`
`167`	`167`	`-EAFNOSUPPORT,`
`168`	`168`	`-EPFNOSUPPORT,`
`169`	`169`	`-EPROTONOSUPPORT,`
`170`		`- -ESOCKTNOSUPPORT);`
	`170`	`+ -ESOCKTNOSUPPORT,`
	`171`	`+ -ENOPROTOOPT);`
`171`	`172`	`}`
`172`	`173`	`_DEFINE_ABS_WRAPPER(NOT_SUPPORTED);`
`173`	`174`