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

r12303: Move split_domain_and_name to util_getent.c and make it static there.

Browse Source 
Volker
(This used to be commit e7f348fcf8)
This commit is contained in:
Volker Lendecke 2005-12-17 15:38:41 +00:00 committed by Gerald (Jerry) Carter
parent 8ee13ab866
commit e1dd50bfd7
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source3/lib/username.c
View File

@ -35,34 +35,6 @@ static BOOL name_is_local(const char *name)
return !(strchr_m(name, *lp_winbind_separator()));
}
/*****************************************************************
Splits passed user or group name to domain and user/group name parts
Returns True if name was splitted and False otherwise.
*****************************************************************/
BOOL split_domain_and_name(const char *name, char *domain, char* username)
{
char *p = strchr(name,*lp_winbind_separator());
/* Parse a string of the form DOMAIN/user into a domain and a user */
DEBUG(10,("split_domain_and_name: checking whether name |%s| local or not\n", name));
if (p) {
fstrcpy(username, p+1);
fstrcpy(domain, name);
domain[PTR_DIFF(p, name)] = 0;
} else if (lp_winbind_use_default_domain()) {
fstrcpy(username, name);
fstrcpy(domain, lp_workgroup());
} else {
return False;
}
DEBUG(10,("split_domain_and_name: all is fine, domain is |%s| and name is |%s|\n", domain, username));
return True;
}
/****************************************************************************
Get a users home directory.
****************************************************************************/

31
source3/lib/util_getent.c
View File

@ -239,6 +239,37 @@ static struct sys_userlist *add_members_to_userlist(struct sys_userlist *list_he
return list_head;
}
/*****************************************************************
Splits passed user or group name to domain and user/group name parts
Returns True if name was splitted and False otherwise.
*****************************************************************/
static BOOL split_domain_and_name(const char *name, char *domain,
char* username)
{
char *p = strchr(name,*lp_winbind_separator());
/* Parse a string of the form DOMAIN/user into a domain and a user */
DEBUG(10,("split_domain_and_name: checking whether name |%s| local or "
"not\n", name));
if (p) {
fstrcpy(username, p+1);
fstrcpy(domain, name);
domain[PTR_DIFF(p, name)] = 0;
} else if (lp_winbind_use_default_domain()) {
fstrcpy(username, name);
fstrcpy(domain, lp_workgroup());
} else {
return False;
}
DEBUG(10,("split_domain_and_name: all is fine, domain is |%s| and "
"name is |%s|\n", domain, username));
return True;
}
/****************************************************************
Get the list of UNIX users in a group.
We have to enumerate the /etc/group file as some UNIX getgrnam()