diff options
| author | Volker Lendecke <vl@samba.org> | 2018-12-10 12:39:29 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2018-12-11 04:22:33 +0100 |
| commit | 6a7a993317119f54e1b1d6e4aa6b295a9827c15f (patch) | |
| tree | 53bc4d7021f46fd842c175b3a2188d91ffc6a9ad | |
| parent | 9ffa6d49a56f9a55ad34f4c687429c8fd14e9d8c (diff) | |
| download | samba-6a7a993317119f54e1b1d6e4aa6b295a9827c15f.tar.gz | |
lib: Remove sid_string_talloc
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Dec 11 04:22:33 CET 2018 on sn-devel-144
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 672fd04c6fc..02463413517 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -467,7 +467,6 @@ bool is_setuid_root(void) ; /* The following definitions come from lib/util_sid.c */ char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid); -char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); char *sid_string_dbg(const struct dom_sid *sid); bool sid_linearize(uint8_t *outbuf, size_t len, const struct dom_sid *sid); bool non_mappable_sid(struct dom_sid *sid); diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index cd33c4fd27c..0e79a6ef2f0 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -40,24 +40,14 @@ char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid) } /***************************************************************** - Essentially a renamed dom_sid_string from - ../libcli/security/dom_sid.c with a panic if it didn't work. -*****************************************************************/ - -char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid) -{ - char *result = dom_sid_string(mem_ctx, sid); - SMB_ASSERT(result != NULL); - return result; -} - -/***************************************************************** Useful function for debug lines. *****************************************************************/ char *sid_string_dbg(const struct dom_sid *sid) { - return sid_string_talloc(talloc_tos(), sid); + char *result = dom_sid_string(talloc_tos(), sid); + SMB_ASSERT(result != NULL); + return result; } /***************************************************************** |