1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
--- src/sss_client/common.c.orig 2014-09-17 13:01:37 UTC
+++ src/sss_client/common.c
@@ -25,6 +25,7 @@
#include "config.h"
#include <nss.h>
+#include <nsswitch.h>
#include <security/pam_modules.h>
#include <errno.h>
#include <sys/types.h>
@@ -43,6 +44,7 @@
#include <libintl.h>
#define _(STRING) dgettext (PACKAGE, STRING)
#include "sss_cli.h"
+#include "util/sss_bsd_errno.h"
#if HAVE_PTHREAD
#include <pthread.h>
@@ -124,7 +126,6 @@ static enum sss_status sss_cli_send_req(enum sss_cli_c
*errnop = error;
break;
case 0:
- *errnop = ETIME;
break;
case 1:
if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
@@ -232,7 +233,6 @@ static enum sss_status sss_cli_recv_rep(enum sss_cli_c
*errnop = error;
break;
case 0:
- *errnop = ETIME;
break;
case 1:
if (pfd.revents & (POLLHUP)) {
@@ -669,7 +669,6 @@ static enum sss_status sss_cli_check_socket(int *errno
*errnop = error;
break;
case 0:
- *errnop = ETIME;
break;
case 1:
if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
@@ -719,23 +718,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_comm
/* avoid looping in the nss daemon */
envval = getenv("_SSS_LOOPS");
if (envval && strcmp(envval, "NO") == 0) {
- return NSS_STATUS_NOTFOUND;
+ return NS_NOTFOUND;
}
ret = sss_cli_check_socket(errnop, SSS_NSS_SOCKET_NAME);
if (ret != SSS_STATUS_SUCCESS) {
- return NSS_STATUS_UNAVAIL;
+ return NS_UNAVAIL;
}
ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
switch (ret) {
case SSS_STATUS_TRYAGAIN:
- return NSS_STATUS_TRYAGAIN;
+ return NS_TRYAGAIN;
case SSS_STATUS_SUCCESS:
- return NSS_STATUS_SUCCESS;
+ return NS_SUCCESS;
case SSS_STATUS_UNAVAIL:
default:
- return NSS_STATUS_UNAVAIL;
+ return NS_UNAVAIL;
}
}
@@ -750,23 +749,23 @@ int sss_pac_make_request(enum sss_cli_command cmd,
/* avoid looping in the nss daemon */
envval = getenv("_SSS_LOOPS");
if (envval && strcmp(envval, "NO") == 0) {
- return NSS_STATUS_NOTFOUND;
+ return NS_NOTFOUND;
}
ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
if (ret != SSS_STATUS_SUCCESS) {
- return NSS_STATUS_UNAVAIL;
+ return NS_UNAVAIL;
}
ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
switch (ret) {
case SSS_STATUS_TRYAGAIN:
- return NSS_STATUS_TRYAGAIN;
+ return NS_TRYAGAIN;
case SSS_STATUS_SUCCESS:
- return NSS_STATUS_SUCCESS;
+ return NS_SUCCESS;
case SSS_STATUS_UNAVAIL:
default:
- return NSS_STATUS_UNAVAIL;
+ return NS_UNAVAIL;
}
}
|
