sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r24746: As the winbindd pipe is officially broken since a while: split out request

Browse Source 
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
This commit is contained in:
Günther Deschner 2007-08-28 15:16:42 +00:00 committed by Gerald (Jerry) Carter
parent 22f2f1e033
commit 18b29763d1
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/nsswitch/wb_common.c
View File

@ -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;
}

22
source/nsswitch/winbindd_nss.h
View File

@ -42,7 +42,7 @@
/* Update this when you change the interface. */
#define WINBIND_INTERFACE_VERSION 18
#define WINBIND_INTERFACE_VERSION 19
/* Have to deal with time_t being 4 or 8 bytes due to structure alignment.
On a 64bit Linux box, we have to support a constant structure size
@ -194,27 +194,28 @@ typedef struct winbindd_gr {
uint32 gr_mem_ofs; /* offset to group membership */
} WINBINDD_GR;
/* PAM specific request flags */
#define WBFLAG_PAM_INFO3_NDR 0x00000001
#define WBFLAG_PAM_INFO3_TEXT 0x00000002
#define WBFLAG_PAM_USER_SESSION_KEY 0x00000004
#define WBFLAG_PAM_LMKEY 0x00000008
#define WBFLAG_PAM_CONTACT_TRUSTDOM 0x00000010
#define WBFLAG_QUERY_ONLY 0x00000020
#define WBFLAG_PAM_UNIX_NAME 0x00000080
#define WBFLAG_PAM_AFS_TOKEN 0x00000100
#define WBFLAG_PAM_NT_STATUS_SQUASH 0x00000200
/* This is a flag that can only be sent from parent to child */
#define WBFLAG_IS_PRIVILEGED 0x00000400
/* Flag to say this is a winbindd internal send - don't recurse. */
#define WBFLAG_RECURSE 0x00000800
#define WBFLAG_PAM_KRB5 0x00001000
#define WBFLAG_PAM_FALLBACK_AFTER_KRB5 0x00002000
#define WBFLAG_PAM_CACHED_LOGIN 0x00004000
#define WBFLAG_PAM_GET_PWD_POLICY 0x00008000 /* not used */
/* generic request flags */
#define WBFLAG_QUERY_ONLY 0x00000020 /* not used */
/* This is a flag that can only be sent from parent to child */
#define WBFLAG_IS_PRIVILEGED 0x00000400 /* not used */
/* Flag to say this is a winbindd internal send - don't recurse. */
#define WBFLAG_RECURSE 0x00000800
#define WINBINDD_MAX_EXTRA_DATA (128*1024)
/* Winbind request structure */
@ -233,7 +234,8 @@ struct winbindd_request {
enum winbindd_cmd original_cmd; /* Original Winbindd command
issued to parent process */
pid_t pid; /* pid of calling process */
uint32 flags; /* flags relavant to a given request */
uint32 wb_flags; /* generic flags */
uint32 flags; /* flags relevant *only* to a given request */
fstring domain_name; /* name of domain for which the request applies */
union {