sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

After consultation with tpot, remove the 'winbind_domain' environment

Browse Source 
variable hack, the feild on the pipe, and the server-side.

It only controlled some enum operations in any case.

This is to try and have less 'magic' environment variables.

Andrew Bartlett
(This used to be commit e4be82e4e2c7cdf15f3e20f73fe9f281f6384423)
This commit is contained in:
Andrew Bartlett 2002-11-26 12:04:16 +00:00
parent 65643516d7
commit 8963cf1e58
5 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/nsswitch/wb_common.c
View File

@ -45,25 +45,11 @@ void free_response(struct winbindd_response *response)
void init_request(struct winbindd_request *request, int request_type)
{
static char *domain_env;
static BOOL initialised;
request->length = sizeof(struct winbindd_request);
request->cmd = (enum winbindd_cmd)request_type;
request->pid = getpid();
request->domain[0] = '\0';
if (!initialised) {
initialised = True;
domain_env = getenv(WINBINDD_DOMAIN_ENV);
}
if (domain_env) {
strncpy(request->domain, domain_env,
sizeof(request->domain) - 1);
request->domain[sizeof(request->domain) - 1] = '\0';
}
}
/* Initialise a response structure */

2
source3/nsswitch/winbindd.c
View File

@ -362,7 +362,7 @@ void winbind_process_packet(struct winbindd_cli_state *state)
/* Process request */
/* Ensure null termination of entire request */
state->request.domain[sizeof(state->request.domain)-1]='\0';
state->request.null_term = '\0';
state->pid = state->request.pid;

13
source3/nsswitch/winbindd_group.c
View File

@ -356,13 +356,6 @@ enum winbindd_result winbindd_setgrent(struct winbindd_cli_state *state)
for (domain = domain_list(); domain != NULL; domain = domain->next) {
struct getent_state *domain_state;
/* Skip domains other than WINBINDD_DOMAIN environment
variable */
if ((strcmp(state->request.domain, "") != 0) &&
!check_domain_env(state->request.domain, domain->name))
continue;
/* Create a state record for this domain */
if ((domain_state = (struct getent_state *)
@ -748,12 +741,6 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
ZERO_STRUCT(groups);
/* Skip domains other than WINBINDD_DOMAIN environment
variable */
if ((strcmp(state->request.domain, "") != 0) &&
!check_domain_env(state->request.domain, domain->name))
continue;
/* Get list of sam groups */
ZERO_STRUCT(groups);
fstrcpy(groups.domain_name, domain->name);

4
source3/nsswitch/winbindd_nss.h
View File

@ -36,7 +36,7 @@
/* Update this when you change the interface. */
#define WINBIND_INTERFACE_VERSION 5
#define WINBIND_INTERFACE_VERSION 6
/* Socket commands */
@ -156,7 +156,7 @@ struct winbindd_request {
} name;
uint32 num_entries; /* getpwent, getgrent */
} data;
fstring domain; /* {set,get,end}{pw,gr}ent() */
char null_term;
};
/* Response values */

17
source3/nsswitch/winbindd_user.c
View File

@ -284,16 +284,6 @@ enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
for(domain = domain_list(); domain != NULL; domain = domain->next) {
struct getent_state *domain_state;
/*
* Skip domains other than WINBINDD_DOMAIN environment
* variable.
*/
if ((strcmp(state->request.domain, "") != 0) &&
!check_domain_env(state->request.domain,
domain->name))
continue;
/* Create a state record for this domain */
if ((domain_state = (struct getent_state *)
@ -551,13 +541,6 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
struct winbindd_methods *methods;
int i;
/* Skip domains other than WINBINDD_DOMAIN environment
variable */
if ((strcmp(state->request.domain, "") != 0) &&
!check_domain_env(state->request.domain, domain->name))
continue;
methods = domain->methods;
/* Query display info */