git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b28371b
)
s3:groupdb: allocate a gid after allocating a rid in pdb_default_create_alias()
author
Michael Adam
<obnox@samba.org>
Thu, 22 Jan 2009 10:10:01 +0000
(11:10 +0100)
committer
Michael Adam
<obnox@samba.org>
Sat, 14 Aug 2010 00:10:29 +0000
(
02:10
+0200)
Michael
source3/groupdb/mapping.c
patch
|
blob
|
history
diff --git
a/source3/groupdb/mapping.c
b/source3/groupdb/mapping.c
index 4cfe9957f4dcd98eeffa26c52acd0c47c773d378..5e2e54487e5dfbd79edd1a7af9c31c515a2049c7 100644
(file)
--- a/
source3/groupdb/mapping.c
+++ b/
source3/groupdb/mapping.c
@@
-486,21
+486,22
@@
NTSTATUS pdb_default_create_alias(struct pdb_methods *methods,
return NT_STATUS_ALIAS_EXISTS;
}
return NT_STATUS_ALIAS_EXISTS;
}
- if (!
winbind_allocate_gid(&g
id)) {
- DEBUG(
3, ("Could not get a gid out of winbind
\n"));
+ if (!
pdb_new_rid(&new_r
id)) {
+ DEBUG(
0, ("Could not allocate a RID.
\n"));
return NT_STATUS_ACCESS_DENIED;
}
return NT_STATUS_ACCESS_DENIED;
}
- if (!pdb_new_rid(&new_rid)) {
- DEBUG(0, ("Could not allocate a RID -- wasted a gid :-(\n"));
+ sid_compose(&sid, get_global_sam_sid(), new_rid);
+
+ if (!winbind_allocate_gid(&gid)) {
+ DEBUG(3, ("Could not get a gid out of winbind - "
+ "wasted a rid :-(\n"));
return NT_STATUS_ACCESS_DENIED;
}
DEBUG(10, ("Creating alias %s with gid %u and rid %u\n",
name, (unsigned int)gid, (unsigned int)new_rid));
return NT_STATUS_ACCESS_DENIED;
}
DEBUG(10, ("Creating alias %s with gid %u and rid %u\n",
name, (unsigned int)gid, (unsigned int)new_rid));
- sid_compose(&sid, get_global_sam_sid(), new_rid);
-
map.gid = gid;
sid_copy(&map.sid, &sid);
map.sid_name_use = SID_NAME_ALIAS;
map.gid = gid;
sid_copy(&map.sid, &sid);
map.sid_name_use = SID_NAME_ALIAS;