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

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 672fd04c6fcd623700c7e3fefe2b0e6e85ea46f6..0246341351781fe611fc29cbd7bbc86d7a046458 100644 (file)
--- 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 cd33c4fd27c5b6cbc3c597b7683460195f1e6acc..0e79a6ef2f05c1f170edcc8555f5135287838831 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -39,25 +39,15 @@ char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid)
        return sidstr_out;
 }
 
-/*****************************************************************
- 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;
 }
 
 /*****************************************************************