diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 03:34:56 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 03:34:56 +0000 |
commit | 14e1232647833c269a292b703fe27718ab27b5f1 (patch) | |
tree | a944a069457b3a6405c79eddbbc8e680ef6cad14 /debian/patches/upstream-19344efa78.diff | |
parent | Merging upstream version 3.4. (diff) | |
download | tmux-14e1232647833c269a292b703fe27718ab27b5f1.tar.xz tmux-14e1232647833c269a292b703fe27718ab27b5f1.zip |
Merging debian version 3.4-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream-19344efa78.diff')
-rw-r--r-- | debian/patches/upstream-19344efa78.diff | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/upstream-19344efa78.diff b/debian/patches/upstream-19344efa78.diff deleted file mode 100644 index aa14f19..0000000 --- a/debian/patches/upstream-19344efa78.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 19344efa78be23a02008be9da0991f54455c9f9e Mon Sep 17 00:00:00 2001 -From: Nicholas Marriott <nicholas.marriott@gmail.com> -Date: Mon, 22 Aug 2022 08:20:49 +0100 -Subject: [PATCH] Fix fallback implementaion of getpeereid, from Pino Toscano. - ---- - compat/getpeereid.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/compat/getpeereid.c b/compat/getpeereid.c -index c194e886..b79f420a 100644 ---- a/compat/getpeereid.c -+++ b/compat/getpeereid.c -@@ -18,6 +18,7 @@ - #include <sys/socket.h> - - #include <stdio.h> -+#include <unistd.h> - - #ifdef HAVE_UCRED_H - #include <ucred.h> -@@ -49,6 +50,8 @@ getpeereid(int s, uid_t *uid, gid_t *gid) - ucred_free(ucred); - return (0); - #else -- return (getuid()); -+ *uid = geteuid(); -+ *gid = getegid(); -+ return (0); - #endif - } --- -2.35.1 - |