smbcacls: Move SidToString to common file

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11237

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/util_sd.h b/source3/include/util_sd.h
new file mode 100644 (file)
index 0000000..55e2205
--- /dev/null
+++ b/source3/include/util_sd.h
@@ -0,0 +1,30 @@
+/*
+   Unix SMB/CIFS implementation.
+   Security Descriptor (SD) helper functions
+
+   Copyright (C) Andrew Tridgell 2000
+   Copyright (C) Tim Potter      2000
+   Copyright (C) Jeremy Allison  2000
+   Copyright (C) Jelmer Vernooij 2003
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __UTIL_SD_H__
+#define __UTIL_SD_H__
+
+void SidToString(struct cli_state *cli, fstring str, const struct dom_sid *sid,
+                bool numeric);
+
+#endif

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
new file mode 100644 (file)
index 0000000..b653fe9
--- /dev/null
+++ b/source3/lib/util_sd.c
@@ -0,0 +1,113 @@
+/*
+   Unix SMB/CIFS implementation.
+   Security Descriptor (SD) helper functions
+
+   Copyright (C) Andrew Tridgell 2000
+   Copyright (C) Tim Potter      2000
+   Copyright (C) Jeremy Allison  2000
+   Copyright (C) Jelmer Vernooij 2003
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libsmb/libsmb.h"
+#include "util_sd.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "../libcli/security/security.h"
+#include "rpc_client/cli_pipe.h"
+#include "rpc_client/cli_lsarpc.h"
+
+/* Open cli connection and policy handle */
+static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
+                                  const struct dom_sid *sid,
+                                  TALLOC_CTX *mem_ctx,
+                                  enum lsa_SidType *type,
+                                  char **domain, char **name)
+{
+       uint16 orig_cnum = cli_state_get_tid(cli);
+       struct rpc_pipe_client *p = NULL;
+       struct policy_handle handle;
+       NTSTATUS status;
+       TALLOC_CTX *frame = talloc_stackframe();
+       enum lsa_SidType *types;
+       char **domains;
+       char **names;
+
+       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto tcon_fail;
+       }
+
+       status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc,
+                                         &p);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       status = rpccli_lsa_open_policy(p, talloc_tos(), True,
+                                       GENERIC_EXECUTE_ACCESS, &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       status = rpccli_lsa_lookup_sids(p, talloc_tos(), &handle, 1, sid,
+                                       &domains, &names, &types);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       *type = types[0];
+       *domain = talloc_move(mem_ctx, &domains[0]);
+       *name = talloc_move(mem_ctx, &names[0]);
+
+       status = NT_STATUS_OK;
+ fail:
+       TALLOC_FREE(p);
+       cli_tdis(cli);
+ tcon_fail:
+       cli_state_set_tid(cli, orig_cnum);
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/* convert a SID to a string, either numeric or username/group */
+void SidToString(struct cli_state *cli, fstring str, const struct dom_sid *sid,
+                bool numeric)
+{
+       char *domain = NULL;
+       char *name = NULL;
+       enum lsa_SidType type;
+       NTSTATUS status;
+
+       sid_to_fstring(str, sid);
+
+       if (numeric) {
+               return;
+       }
+
+       status = cli_lsa_lookup_sid(cli, sid, talloc_tos(), &type,
+                                   &domain, &name);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return;
+       }
+
+       if (*domain) {
+               slprintf(str, sizeof(fstring) - 1, "%s%s%s",
+                       domain, lp_winbind_separator(), name);
+       } else {
+               fstrcpy(str, name);
+       }
+}

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index f3e0eb521269a3b6afbf8f50a55e0ee04e22033f..5bbc8fa812cef1954ed38d6e8fbb6e40f1db738b 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -31,6 +31,7 @@
 #include "libsmb/clirap.h"
 #include "passdb/machine_sid.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "util_sd.h"
 
 static int test_args;
 
@@ -71,60 +72,6 @@ static const struct perm_value standard_values[] = {
        { NULL, 0 },
 };
 
-/* Open cli connection and policy handle */
-
-static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
-                                  const struct dom_sid *sid,
-                                  TALLOC_CTX *mem_ctx,
-                                  enum lsa_SidType *type,
-                                  char **domain, char **name)
-{
-       uint16 orig_cnum = cli_state_get_tid(cli);
-       struct rpc_pipe_client *p = NULL;
-       struct policy_handle handle;
-       NTSTATUS status;
-       TALLOC_CTX *frame = talloc_stackframe();
-       enum lsa_SidType *types;
-       char **domains;
-       char **names;
-
-       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto tcon_fail;
-       }
-
-       status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc,
-                                         &p);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       status = rpccli_lsa_open_policy(p, talloc_tos(), True,
-                                       GENERIC_EXECUTE_ACCESS, &handle);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       status = rpccli_lsa_lookup_sids(p, talloc_tos(), &handle, 1, sid,
-                                       &domains, &names, &types);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       *type = types[0];
-       *domain = talloc_move(mem_ctx, &domains[0]);
-       *name = talloc_move(mem_ctx, &names[0]);
-
-       status = NT_STATUS_OK;
- fail:
-       TALLOC_FREE(p);
-       cli_tdis(cli);
- tcon_fail:
-       cli_state_set_tid(cli, orig_cnum);
-       TALLOC_FREE(frame);
-       return status;
-}
-
 static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
                                    const char *name,
                                    enum lsa_SidType *type,
@@ -250,37 +197,6 @@ static struct dom_sid *get_domain_sid(struct cli_state *cli)
        return sid;
 }
 
-
-/* convert a SID to a string, either numeric or username/group */
-static void SidToString(struct cli_state *cli, fstring str,
-                       const struct dom_sid *sid, bool numeric)
-{
-       char *domain = NULL;
-       char *name = NULL;
-       enum lsa_SidType type;
-       NTSTATUS status;
-
-       sid_to_fstring(str, sid);
-
-       if (numeric) {
-               return;
-       }
-
-       status = cli_lsa_lookup_sid(cli, sid, talloc_tos(), &type,
-                                   &domain, &name);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               return;
-       }
-
-       if (*domain) {
-               slprintf(str, sizeof(fstring) - 1, "%s%s%s",
-                       domain, lp_winbind_separator(), name);
-       } else {
-               fstrcpy(str, name);
-       }
-}
-
 /* convert a string to a SID, either numeric or username/group */
 static bool StringToSid(struct cli_state *cli, struct dom_sid *sid, const char *str)
 {

diff --git a/source3/wscript_build b/source3/wscript_build
index d8b0bf35dca4c67e4edf96403503a67e70858977..36eb1b79294061441ed658e94edf01e1f89f6fd3 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1340,7 +1340,7 @@ bld.SAMBA3_BINARY('msg_source',
                  install=False)
 
 bld.SAMBA3_BINARY('smbcacls',
-                 source='utils/smbcacls.c',
+                 source='utils/smbcacls.c lib/util_sd.c',
                  deps='''
                  talloc
                  popt_samba3