diff options
| author | Günther Deschner <gd@samba.org> | 2007-08-28 15:16:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:17 -0500 |
| commit | 18b29763d1ea0e9198f45bafa460dd68cb69a3d5 (patch) | |
| tree | e573295afa184395691c09461404763f40cfcbf2 /source/nsswitch/wb_common.c | |
| parent | 22f2f1e033a7a6877c6b8a0847179728a408af85 (diff) | |
| download | samba-18b29763d1ea0e9198f45bafa460dd68cb69a3d5.tar.gz samba-18b29763d1ea0e9198f45bafa460dd68cb69a3d5.tar.xz samba-18b29763d1ea0e9198f45bafa460dd68cb69a3d5.zip | |
r24746: As the winbindd pipe is officially broken since a while: split out request
specfic and generic flags in a winbindd_request.
It turns out that the WBFLAG_RECURSE flag is the only non-PAM specific flag we
put into the "flags" field of a winbind request anyway. Now each request
command can use the entire space of the "flags" field.
Guenther
Diffstat (limited to 'source/nsswitch/wb_common.c')
| -rw-r--r-- | source/nsswitch/wb_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c index feae08ef3e3..809549ffd7e 100644 --- a/source/nsswitch/wb_common.c +++ b/source/nsswitch/wb_common.c @@ -320,7 +320,7 @@ static int winbind_open_pipe_sock(int recursing, int need_priv) /* version-check the socket */ - request.flags = WBFLAG_RECURSE; + request.wb_flags = WBFLAG_RECURSE; if ((winbindd_request_response(WINBINDD_INTERFACE_VERSION, &request, &response) != NSS_STATUS_SUCCESS) || (response.data.interface_version != WINBIND_INTERFACE_VERSION)) { close_sock(); return -1; @@ -328,7 +328,7 @@ static int winbind_open_pipe_sock(int recursing, int need_priv) /* try and get priv pipe */ - request.flags = WBFLAG_RECURSE; + request.wb_flags = WBFLAG_RECURSE; if (winbindd_request_response(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) { int fd; if ((fd = winbind_named_pipe_sock((char *)response.extra_data.data)) != -1) { @@ -567,13 +567,13 @@ NSS_STATUS winbindd_send_request(int req_type, int need_priv, init_request(request, req_type); if (write_sock(request, sizeof(*request), - request->flags & WBFLAG_RECURSE, need_priv) == -1) { + request->wb_flags & WBFLAG_RECURSE, need_priv) == -1) { return NSS_STATUS_UNAVAIL; } if ((request->extra_len != 0) && (write_sock(request->extra_data.data, request->extra_len, - request->flags & WBFLAG_RECURSE, need_priv) == -1)) { + request->wb_flags & WBFLAG_RECURSE, need_priv) == -1)) { return NSS_STATUS_UNAVAIL; } |