summaryrefslogtreecommitdiff
path: root/source4/lib/username.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-05-13 15:34:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:53:42 -0500
commitd12e825042d1f108051eb6e205340dee444d5591 (patch)
tree5adf81912ab36d1a9c1e3eb28f6aa6d83c655a05 /source4/lib/username.c
parent060f94b9fcf9ceddff6700738e35b537cef605ca (diff)
downloadsamba-d12e825042d1f108051eb6e205340dee444d5591.tar.gz
samba-d12e825042d1f108051eb6e205340dee444d5591.tar.bz2
samba-d12e825042d1f108051eb6e205340dee444d5591.zip
r685: The SAM is dead! Long live the new SAM! ;-)
This commit kills passdb, which was only hosting the auth subsystem. With the work tridge has done on Samba4's SAM backend, this can (and now is) all hosted on ldb. The auth_sam.c file now references this backend. You will need to assign your users passwords in ldb - adding a new line: unicodePwd: myPass to a record, using ldbedit, should be sufficient. Naturally, this assumes you have had your personal SAMR provisioning tutorial from tridge. Everybody else can still use the anonymous logins. Andrew Bartlett (This used to be commit 2aa0b55fb86648731d5f2201fa5a6aa993b7ca48)
Diffstat (limited to 'source4/lib/username.c')
-rw-r--r--source4/lib/username.c46
1 files changed, 0 insertions, 46 deletions
diff --git a/source4/lib/username.c b/source4/lib/username.c
index 2d6cd651c5..3af9dbd027 100644
--- a/source4/lib/username.c
+++ b/source4/lib/username.c
@@ -26,16 +26,6 @@ static struct passwd *uname_string_combinations(char *s, struct passwd * (*fn) (
static struct passwd *uname_string_combinations2(char *s, int offset, struct passwd * (*fn) (const char *), int N);
/*****************************************************************
- Check if a user or group name is local (this is a *local* name for
- *local* people, there's nothing for you here...).
-*****************************************************************/
-
-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.
*****************************************************************/
@@ -398,42 +388,6 @@ BOOL user_in_list(const char *user,const char **list, gid_t *groups, size_t n_gr
if(user_in_group_list(user, *list +2, groups, n_groups))
return True;
}
- } else if (!name_is_local(*list)) {
- /*
- * If user name did not match and token is not
- * a unix group and the token has a winbind separator in the
- * name then see if it is a Windows group.
- */
-
- DOM_SID g_sid;
- enum SID_NAME_USE name_type;
- BOOL winbind_answered = False;
- BOOL ret;
- fstring groupname, domain;
-
- /* Parse a string of the form DOMAIN/user into a domain and a user */
-
- char *p = strchr(*list,*lp_winbind_separator());
-
- DEBUG(10,("user_in_list: checking if user |%s| is in winbind group |%s|\n", user, *list));
-
- if (p) {
- fstrcpy(groupname, p+1);
- fstrcpy(domain, *list);
- domain[PTR_DIFF(p, *list)] = 0;
-
- /* Check to see if name is a Windows group */
- if (winbind_lookup_name(domain, groupname, &g_sid, &name_type) && name_type == SID_NAME_DOM_GRP) {
-
- /* Check if user name is in the Windows group */
- ret = user_in_winbind_group_list(user, *list, &winbind_answered);
-
- if (winbind_answered && ret == True) {
- DEBUG(10,("user_in_list: user |%s| is in winbind group |%s|\n", user, *list));
- return ret;
- }
- }
- }
}
list++;