mirror of
https://github.com/samba-team/samba.git
synced 2025-01-10 01:18:15 +03:00
r17408: Let us use netgroups even without a NIS domain but just using files
(This used to be commit c065341d3f
)
This commit is contained in:
parent
43c7f6d1d1
commit
ab75c56370
@ -83,8 +83,7 @@ static BOOL string_match(const char *tok,const char *s, char *invalid_char)
|
|||||||
yp_get_default_domain(&mydomain);
|
yp_get_default_domain(&mydomain);
|
||||||
|
|
||||||
if (!mydomain) {
|
if (!mydomain) {
|
||||||
DEBUG(0,("Unable to get default yp domain.\n"));
|
DEBUG(0,("Unable to get default yp domain. Try without it.\n"));
|
||||||
return False;
|
|
||||||
}
|
}
|
||||||
if (!(hostname = SMB_STRDUP(s))) {
|
if (!(hostname = SMB_STRDUP(s))) {
|
||||||
DEBUG(1,("out of memory for strdup!\n"));
|
DEBUG(1,("out of memory for strdup!\n"));
|
||||||
@ -95,7 +94,7 @@ static BOOL string_match(const char *tok,const char *s, char *invalid_char)
|
|||||||
|
|
||||||
DEBUG(5,("looking for %s of domain %s in netgroup %s gave %s\n",
|
DEBUG(5,("looking for %s of domain %s in netgroup %s gave %s\n",
|
||||||
hostname,
|
hostname,
|
||||||
mydomain,
|
mydomain?mydomain:"(ANY)",
|
||||||
tok+1,
|
tok+1,
|
||||||
BOOLSTR(netgroup_ok)));
|
BOOLSTR(netgroup_ok)));
|
||||||
|
|
||||||
|
@ -417,12 +417,11 @@ BOOL user_in_netgroup(const char *user, const char *ngname)
|
|||||||
yp_get_default_domain(&mydomain);
|
yp_get_default_domain(&mydomain);
|
||||||
|
|
||||||
if(mydomain == NULL) {
|
if(mydomain == NULL) {
|
||||||
DEBUG(5,("Unable to get default yp domain\n"));
|
DEBUG(5,("Unable to get default yp domain, let's try without specifying it\n"));
|
||||||
return False;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DEBUG(5,("looking for user %s of domain %s in netgroup %s\n",
|
DEBUG(5,("looking for user %s of domain %s in netgroup %s\n",
|
||||||
user, mydomain, ngname));
|
user, mydomain?mydomain:"(ANY)", ngname));
|
||||||
|
|
||||||
if (innetgr(ngname, NULL, user, mydomain)) {
|
if (innetgr(ngname, NULL, user, mydomain)) {
|
||||||
DEBUG(5,("user_in_netgroup: Found\n"));
|
DEBUG(5,("user_in_netgroup: Found\n"));
|
||||||
@ -438,7 +437,7 @@ BOOL user_in_netgroup(const char *user, const char *ngname)
|
|||||||
strlower_m(lowercase_user);
|
strlower_m(lowercase_user);
|
||||||
|
|
||||||
DEBUG(5,("looking for user %s of domain %s in netgroup %s\n",
|
DEBUG(5,("looking for user %s of domain %s in netgroup %s\n",
|
||||||
lowercase_user, mydomain, ngname));
|
lowercase_user, mydomain?mydomain:"(ANY)", ngname));
|
||||||
|
|
||||||
if (innetgr(ngname, NULL, lowercase_user, mydomain)) {
|
if (innetgr(ngname, NULL, lowercase_user, mydomain)) {
|
||||||
DEBUG(5,("user_in_netgroup: Found\n"));
|
DEBUG(5,("user_in_netgroup: Found\n"));
|
||||||
|
Loading…
Reference in New Issue
Block a user