sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Merge removal of unpopular winbind client environment variable.

Browse Source 
(This used to be commit 0637f582fe)
This commit is contained in:
Tim Potter 2002-12-20 01:37:39 +00:00
parent 45030bcbca
commit 8c93138982
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/nsswitch/wb_common.c
View File

@ -24,8 +24,7 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#include "winbind_nss_config.h" #include "winbind_client.h"
#include "winbindd_nss.h"
/* Global variables. These are effectively the client state information */ /* Global variables. These are effectively the client state information */
@ -45,25 +44,11 @@ void free_response(struct winbindd_response *response)
void init_request(struct winbindd_request *request, int request_type) void init_request(struct winbindd_request *request, int request_type)
{ {
static char *domain_env;
static BOOL initialised;
request->length = sizeof(struct winbindd_request); request->length = sizeof(struct winbindd_request);
request->cmd = (enum winbindd_cmd)request_type; request->cmd = (enum winbindd_cmd)request_type;
request->pid = getpid(); 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 */ /* Initialise a response structure */

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) { for (domain = domain_list(); domain != NULL; domain = domain->next) {
struct getent_state *domain_state; 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 */ /* Create a state record for this domain */
if ((domain_state = (struct getent_state *) if ((domain_state = (struct getent_state *)
@ -748,12 +741,6 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
ZERO_STRUCT(groups); 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 */ /* Get list of sam groups */
ZERO_STRUCT(groups); ZERO_STRUCT(groups);
fstrcpy(groups.domain_name, domain->name); fstrcpy(groups.domain_name, domain->name);

18
source3/nsswitch/winbindd_user.c
View File

@ -73,7 +73,6 @@ static BOOL winbindd_fill_pwent(char *dom_name, char *user_name,
by lp_string() calling standard_sub_basic(). */ by lp_string() calling standard_sub_basic(). */
fstrcpy(current_user_info.smb_name, user_name); fstrcpy(current_user_info.smb_name, user_name);
sub_set_smb_name(user_name);
fstrcpy(current_user_info.domain, dom_name); fstrcpy(current_user_info.domain, dom_name);
pstrcpy(homedir, lp_template_homedir()); pstrcpy(homedir, lp_template_homedir());
@ -285,16 +284,6 @@ enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
for(domain = domain_list(); domain != NULL; domain = domain->next) { for(domain = domain_list(); domain != NULL; domain = domain->next) {
struct getent_state *domain_state; 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 */ /* Create a state record for this domain */
if ((domain_state = (struct getent_state *) if ((domain_state = (struct getent_state *)
@ -552,13 +541,6 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
struct winbindd_methods *methods; struct winbindd_methods *methods;
int i; 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; methods = domain->methods;
/* Query display info */ /* Query display info */