diff options
author | Volker Lendecke <vl@samba.org> | 2009-02-12 17:48:52 +0100 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2009-03-07 17:51:21 +0100 |
commit | 46bcb10b5abb21758cf234764b64220ede1b7ab5 (patch) | |
tree | c99007849f0599477797d3186c563f52d419513e /source3/utils/net_sam.c | |
parent | e58ade4136b40d82c24f3556845e7412a3330992 (diff) | |
download | samba-46bcb10b5abb21758cf234764b64220ede1b7ab5.tar.gz samba-46bcb10b5abb21758cf234764b64220ede1b7ab5.tar.xz samba-46bcb10b5abb21758cf234764b64220ede1b7ab5.zip |
Shape up pdb_search a bit by making it a talloc ctx with a destructor
Diffstat (limited to 'source3/utils/net_sam.c')
-rw-r--r-- | source3/utils/net_sam.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index e8ebb602057..eea22c0dc20 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -1269,28 +1269,31 @@ static int net_sam_do_list(struct net_context *c, int argc, const char **argv, } } - pdb_search_destroy(search); + TALLOC_FREE(search); return 0; } static int net_sam_list_users(struct net_context *c, int argc, const char **argv) { - return net_sam_do_list(c, argc, argv, pdb_search_users(ACB_NORMAL), + return net_sam_do_list(c, argc, argv, + pdb_search_users(talloc_tos(), ACB_NORMAL), "users"); } static int net_sam_list_groups(struct net_context *c, int argc, const char **argv) { - return net_sam_do_list(c, argc, argv, pdb_search_groups(), "groups"); + return net_sam_do_list(c, argc, argv, pdb_search_groups(talloc_tos()), + "groups"); } static int net_sam_list_localgroups(struct net_context *c, int argc, const char **argv) { return net_sam_do_list(c, argc, argv, - pdb_search_aliases(get_global_sam_sid()), + pdb_search_aliases(talloc_tos(), + get_global_sam_sid()), "localgroups"); } @@ -1298,7 +1301,8 @@ static int net_sam_list_builtin(struct net_context *c, int argc, const char **argv) { return net_sam_do_list(c, argc, argv, - pdb_search_aliases(&global_sid_Builtin), + pdb_search_aliases(talloc_tos(), + &global_sid_Builtin), "builtin"); } @@ -1306,7 +1310,7 @@ static int net_sam_list_workstations(struct net_context *c, int argc, const char **argv) { return net_sam_do_list(c, argc, argv, - pdb_search_users(ACB_WSTRUST), + pdb_search_users(talloc_tos(), ACB_WSTRUST), "workstations"); } |