mirror of
https://github.com/samba-team/samba.git
synced 2025-11-14 12:23:52 +03:00
r17463: A bit of cleanup work:
Remove some unused code: pdb_find_alias is not used anymore, and nobody I think has ever used the pdb_nop operations for group mapping. smbpasswd and tdb use the default ones and ldap has its own. Make the functions pdb_getgr* return NTSTATUS instead of BOOL. Nobody right now really makes use of it, but it feels wrong to throw away information so early. Volker
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
954593bd41
commit
f9856f6490
@@ -330,7 +330,7 @@ static int net_sam_set_comment(int argc, const char **argv)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!pdb_getgrsid(&map, &sid)) {
|
||||
if (!NT_STATUS_IS_OK(pdb_getgrsid(&map, &sid))) {
|
||||
d_fprintf(stderr, "Could not load group %s\n", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
@@ -882,7 +882,7 @@ static int net_sam_provision(int argc, const char **argv)
|
||||
|
||||
sid_compose(&gsid, get_global_sam_sid(), DOMAIN_GROUP_RID_USERS);
|
||||
|
||||
if (!pdb_getgrsid(&gmap, &gsid)) {
|
||||
if (!NT_STATUS_IS_OK(pdb_getgrsid(&gmap, &gsid))) {
|
||||
LDAPMod **mods = NULL;
|
||||
char *dn;
|
||||
char *uname;
|
||||
@@ -935,7 +935,7 @@ domu_done:
|
||||
|
||||
sid_compose(&gsid, get_global_sam_sid(), DOMAIN_GROUP_RID_ADMINS);
|
||||
|
||||
if (!pdb_getgrsid(&gmap, &gsid)) {
|
||||
if (!NT_STATUS_IS_OK(pdb_getgrsid(&gmap, &gsid))) {
|
||||
LDAPMod **mods = NULL;
|
||||
char *dn;
|
||||
char *uname;
|
||||
@@ -1153,7 +1153,7 @@ doma_done:
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (!pdb_getgrgid(&gmap, pwd->pw_gid)) {
|
||||
if (!NT_STATUS_IS_OK(pdb_getgrgid(&gmap, pwd->pw_gid))) {
|
||||
LDAPMod **mods = NULL;
|
||||
char *dn;
|
||||
char *uname;
|
||||
|
||||
Reference in New Issue
Block a user