diff options
| author | William Grzybowski <wg@FreeBSD.org> | 2013-10-26 19:42:17 +0000 |
|---|---|---|
| committer | William Grzybowski <wg@FreeBSD.org> | 2013-10-26 19:42:17 +0000 |
| commit | 35c7e2debe6255da7b3572ab98479dc7e3cd4d7a (patch) | |
| tree | 399c1810f8eb631ecd03ec2b0bd0d62c2a64d71e /security/sssd/files/patch-src__sss_client__common.c | |
| parent | Use bsd.port.post.mk instead of bsd.port.mk. (diff) | |
security/sssd: update to 1.9.5
- Update to 1.9.5 [1]
- Allow staging
- Convert lib depends to new format
- Use correct autotools
PR: ports/181566
Submitted by: Lukas Slebodnik <lukas.slebodnik intrak.sk>
Approved by: maintainer (timeout)
Diffstat (limited to 'security/sssd/files/patch-src__sss_client__common.c')
| -rw-r--r-- | security/sssd/files/patch-src__sss_client__common.c | 50 |
1 files changed, 42 insertions, 8 deletions
diff --git a/security/sssd/files/patch-src__sss_client__common.c b/security/sssd/files/patch-src__sss_client__common.c index b5afcd3a3c99..bb7beed38179 100644 --- a/security/sssd/files/patch-src__sss_client__common.c +++ b/security/sssd/files/patch-src__sss_client__common.c @@ -1,6 +1,17 @@ ---- ./src/sss_client/common.c.orig 2011-08-29 11:39:05.000000000 -0400 -+++ ./src/sss_client/common.c 2011-10-13 12:15:03.000000000 -0400 -@@ -26,6 +26,7 @@ +From f40ad7e39f68345f3bfec169556463c1a13706e0 Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> +Date: Sat, 4 May 2013 16:08:11 +0200 +Subject: [PATCH 18/34] patch-src__sss_client__common.c + +--- + src/sss_client/common.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git src/sss_client/common.c src/sss_client/common.c +index 6639ae1..d0b5c6d 100644 +--- src/sss_client/common.c ++++ src/sss_client/common.c +@@ -25,6 +25,7 @@ #include "config.h" #include <nss.h> @@ -8,7 +19,18 @@ #include <security/pam_modules.h> #include <errno.h> #include <sys/types.h> -@@ -111,7 +112,6 @@ +@@ -61,6 +62,10 @@ + #define SSS_DEFAULT_WRITE_FLAGS 0 + #endif + ++#ifndef EOWNERDEAD ++#define EOWNERDEAD 130 ++#endif ++ + /* common functions */ + + int sss_cli_sd = -1; /* the sss client socket descriptor */ +@@ -124,7 +129,6 @@ static enum sss_status sss_cli_send_req(enum sss_cli_command cmd, *errnop = error; break; case 0: @@ -16,15 +38,15 @@ break; case 1: if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -@@ -216,7 +216,6 @@ +@@ -232,7 +236,6 @@ static enum sss_status sss_cli_recv_rep(enum sss_cli_command cmd, *errnop = error; break; case 0: - *errnop = ETIME; break; case 1: - if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -@@ -638,7 +637,6 @@ + if (pfd.revents & (POLLHUP)) { +@@ -669,7 +672,6 @@ static enum sss_status sss_cli_check_socket(int *errnop, const char *socket_name *errnop = error; break; case 0: @@ -32,7 +54,7 @@ break; case 1: if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -@@ -688,23 +686,23 @@ +@@ -719,23 +721,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_command cmd, /* avoid looping in the nss daemon */ envval = getenv("_SSS_LOOPS"); if (envval && strcmp(envval, "NO") == 0) { @@ -61,3 +83,15 @@ } } +@@ -984,7 +986,7 @@ errno_t sss_strnlen(const char *str, size_t maxlen, size_t *len) + *len = 0; + while (*len < maxlen) { + if (str[*len] == '\0') break; +- len++; ++ ++*len; + } + #endif + +-- +1.8.0 + |