diff options
Diffstat (limited to 'source3/rpc_parse/parse_net.c')
| -rw-r--r-- | source3/rpc_parse/parse_net.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index 43bd8cd20e..f977549a07 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -1283,7 +1283,6 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, /* need to count the number of space-delimited sids */ unsigned int i; int num_other_sids = 0; - char *username; NTTIME logon_time, logoff_time, kickoff_time, pass_last_set_time, pass_can_change_time, @@ -1295,21 +1294,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, int len_logon_srv = strlen(logon_srv); int len_logon_dom = strlen(logon_dom); - - /* do some cleanup on the user name here to deal with users from a - trusted domain logging onto a client in our domain. If we are running - winbindd, the trusted users will be of the form DOMAIN\user so strip - out the domain portion. I noticed then when looking at an SMBsessionsetup&X. - The client was sending GLASS\Administrator as the username and GLASS as the - domain name -- jerry */ - - if ( (username = strchr( user_name, *lp_winbind_separator() )) != NULL ) - username++; - else - username = user_name; - - - len_user_name = strlen(username ); + len_user_name = strlen(user_name ); len_full_name = strlen(full_name ); len_home_dir = strlen(home_dir ); len_dir_drive = strlen(dir_drive ); @@ -1372,7 +1357,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, usr->num_other_sids = num_other_sids; usr->buffer_other_sids = (num_other_sids != 0) ? 1 : 0; - init_unistr2(&usr->uni_user_name, username, len_user_name); + init_unistr2(&usr->uni_user_name, user_name, len_user_name); init_unistr2(&usr->uni_full_name, full_name, len_full_name); init_unistr2(&usr->uni_logon_script, logon_script, len_logon_script); init_unistr2(&usr->uni_profile_path, profile_path, len_profile_path); |