summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-03-23 02:14:08 +0000
committerJeremy Allison <jra@samba.org>2001-03-23 02:14:08 +0000
commitda8805b377e361a7cab399b3c786a25f7175e7cf (patch)
tree303b5ee23528c69fb7bb1f5e1dc166f87d3db7a5 /source3/rpc_server
parent810ea03f9b1960ca7e9a775cd3582ca6bc080597 (diff)
downloadsamba-da8805b377e361a7cab399b3c786a25f7175e7cf.tar.gz
samba-da8805b377e361a7cab399b3c786a25f7175e7cf.tar.bz2
samba-da8805b377e361a7cab399b3c786a25f7175e7cf.zip
groupdb/mapping.c:
include/proto.h: Fix missing (void) in proto. rpc_server/srv_samr_nt.c: Fix user private group problem by filtering out groups that clash with users. smbd/posix_acls.c: Ensure default ACE's are sensible. utils/pdbedit.c: Fix from Simo Sorce. Jeremy. (This used to be commit 29414fe0d6665642d9b5f88a35e712426376c47f)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_samr_nt.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 94524da352..2434fad74a 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -798,10 +798,20 @@ static BOOL get_group_alias_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 star
uint32 trid;
name = grp->gr_name;
+ DEBUG(10,("get_group_alias_entries: got group %s\n", name ));
+
/* Don't return winbind groups as they are not local! */
- if (strchr(name, *sep) != NULL)
+ if (strchr(name, *sep) != NULL) {
+ DEBUG(10,("get_group_alias_entries: not returing %s, not local.\n", name ));
continue;
+ }
+
+ /* Don't return user private groups... */
+ if (Get_Pwnam(name, False) != 0) {
+ DEBUG(10,("get_group_alias_entries: not returing %s, clashes with user.\n", name ));
+ continue;
+ }
trid = pdb_gid_to_group_rid(grp->gr_gid);
for( i = 0; i < num_entries; i++)