s3:utils: make use of cli_tree_connect()
[bbaumbach/samba-autobuild/.git] / source3 / utils / smbcacls.c
index 5ccdae6d08f356af0affdb24157a0ba3c1e97ad6..de68963750f80b0c92aae023fc029e2eedbc4f1d 100644 (file)
@@ -1,33 +1,36 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    ACL get/set utility
-   
+
    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 "popt_common.h"
+#include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
-
-extern bool AllowDebugChange;
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "passdb/machine_sid.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
 
 static int test_args;
 
@@ -39,6 +42,8 @@ static int numeric;
 
 static int sddl;
 
+static const char *domain_sid = NULL;
+
 enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
 enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP, REQUEST_INHERIT};
 enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
@@ -75,7 +80,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
                                   enum lsa_SidType *type,
                                   char **domain, char **name)
 {
-       uint16 orig_cnum = cli->cnum;
+       uint16 orig_cnum = cli_state_get_tid(cli);
        struct rpc_pipe_client *p = NULL;
        struct policy_handle handle;
        NTSTATUS status;
@@ -84,9 +89,9 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
        char **domains;
        char **names;
 
-       status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
        if (!NT_STATUS_IS_OK(status)) {
-               return status;
+               goto tcon_fail;
        }
 
        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
@@ -115,7 +120,8 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
  fail:
        TALLOC_FREE(p);
        cli_tdis(cli);
-       cli->cnum = orig_cnum;
+ tcon_fail:
+       cli_state_set_tid(cli, orig_cnum);
        TALLOC_FREE(frame);
        return status;
 }
@@ -125,7 +131,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
                                    enum lsa_SidType *type,
                                    struct dom_sid *sid)
 {
-       uint16 orig_cnum = cli->cnum;
+       uint16 orig_cnum = cli_state_get_tid(cli);
        struct rpc_pipe_client *p;
        struct policy_handle handle;
        NTSTATUS status;
@@ -133,9 +139,9 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
        struct dom_sid *sids;
        enum lsa_SidType *types;
 
-       status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
        if (!NT_STATUS_IS_OK(status)) {
-               return status;
+               goto tcon_fail;
        }
 
        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
@@ -163,11 +169,90 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
  fail:
        TALLOC_FREE(p);
        cli_tdis(cli);
-       cli->cnum = orig_cnum;
+ tcon_fail:
+       cli_state_set_tid(cli, orig_cnum);
        TALLOC_FREE(frame);
        return status;
 }
 
+
+static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli,
+                                         struct dom_sid *sid)
+{
+       union lsa_PolicyInformation *info = NULL;
+       uint16 orig_cnum = cli_state_get_tid(cli);
+       struct rpc_pipe_client *rpc_pipe = NULL;
+       struct policy_handle handle;
+       NTSTATUS status, result;
+       TALLOC_CTX *frame = talloc_stackframe();
+       const struct ndr_syntax_id *lsarpc_syntax = &ndr_table_lsarpc.syntax_id;
+
+       status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       status = cli_rpc_pipe_open_noauth(cli, lsarpc_syntax, &rpc_pipe);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto tdis;
+       }
+
+       status = rpccli_lsa_open_policy(rpc_pipe, frame, True,
+                                       GENERIC_EXECUTE_ACCESS, &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto tdis;
+       }
+
+       status = dcerpc_lsa_QueryInfoPolicy2(rpc_pipe->binding_handle,
+                                            frame, &handle,
+                                            LSA_POLICY_INFO_DOMAIN,
+                                            &info, &result);
+
+       if (any_nt_status_not_ok(status, result, &status)) {
+               goto tdis;
+       }
+
+       *sid = *info->domain.sid;
+
+tdis:
+       TALLOC_FREE(rpc_pipe);
+       cli_tdis(cli);
+done:
+       cli_state_set_tid(cli, orig_cnum);
+       TALLOC_FREE(frame);
+       return status;
+}
+
+static struct dom_sid *get_domain_sid(struct cli_state *cli)
+{
+       NTSTATUS status;
+
+       struct dom_sid *sid = talloc(talloc_tos(), struct dom_sid);
+       if (sid == NULL) {
+               DEBUG(0, ("Out of memory\n"));
+               return NULL;
+       }
+
+       if (domain_sid) {
+               if (!dom_sid_parse(domain_sid, sid)) {
+                       DEBUG(0,("failed to parse domain sid\n"));
+                       TALLOC_FREE(sid);
+               }
+       } else {
+               status = cli_lsa_lookup_domain_sid(cli, sid);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("failed to lookup domain sid: %s\n", nt_errstr(status)));
+                       TALLOC_FREE(sid);
+               }
+
+       }
+
+       DEBUG(2,("Domain SID: %s\n", sid_string_dbg(sid)));
+       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)
 {
@@ -202,8 +287,8 @@ static bool StringToSid(struct cli_state *cli, struct dom_sid *sid, const char *
 {
        enum lsa_SidType type;
 
-       if (strncmp(str, "S-", 2) == 0) {
-               return string_to_sid(sid, str);
+       if (string_to_sid(sid, str)) {
+               return true;
        }
 
        return NT_STATUS_IS_OK(cli_lsa_lookup_name(cli, str, &type, sid));
@@ -358,7 +443,12 @@ static bool parse_ace_flags(const char *str, unsigned int *pflags)
                        return false;
                }
 
-               if (*p != '|' && *p != '\0') {
+               switch (*p) {
+               case '|':
+                       p++;
+               case '\0':
+                       continue;
+               default:
                        return false;
                }
        }
@@ -625,6 +715,48 @@ static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_st
        return ret;
 }
 
+static const struct {
+       uint16_t mask;
+       const char *str;
+       const char *desc;
+} sec_desc_ctrl_bits[] = {
+       {SEC_DESC_OWNER_DEFAULTED,       "OD", "Owner Defaulted"},
+       {SEC_DESC_GROUP_DEFAULTED,       "GD", "Group Defaulted"},
+       {SEC_DESC_DACL_PRESENT,          "DP", "DACL Present"},
+       {SEC_DESC_DACL_DEFAULTED,        "DD", "DACL Defaulted"},
+       {SEC_DESC_SACL_PRESENT,          "SP", "SACL Present"},
+       {SEC_DESC_SACL_DEFAULTED,        "SD", "SACL Defaulted"},
+       {SEC_DESC_DACL_TRUSTED,          "DT", "DACL Trusted"},
+       {SEC_DESC_SERVER_SECURITY,       "SS", "Server Security"},
+       {SEC_DESC_DACL_AUTO_INHERIT_REQ, "DR", "DACL Inheritance Required"},
+       {SEC_DESC_SACL_AUTO_INHERIT_REQ, "SR", "SACL Inheritance Required"},
+       {SEC_DESC_DACL_AUTO_INHERITED,   "DI", "DACL Auto Inherited"},
+       {SEC_DESC_SACL_AUTO_INHERITED,   "SI", "SACL Auto Inherited"},
+       {SEC_DESC_DACL_PROTECTED,        "PD", "DACL Protected"},
+       {SEC_DESC_SACL_PROTECTED,        "PS", "SACL Protected"},
+       {SEC_DESC_RM_CONTROL_VALID,      "RM", "RM Control Valid"},
+       {SEC_DESC_SELF_RELATIVE ,        "SR", "Self Relative"},
+};
+
+static void print_acl_ctrl(FILE *file, uint16_t ctrl)
+{
+       int i;
+       const char* separator = "";
+
+       fprintf(file, "CONTROL:");
+       if (numeric) {
+               fprintf(file, "0x%x\n", ctrl);
+               return;
+       }
+
+       for (i = ARRAY_SIZE(sec_desc_ctrl_bits) - 1; i >= 0; i--) {
+               if (ctrl & sec_desc_ctrl_bits[i].mask) {
+                       fprintf(file, "%s%s", separator, sec_desc_ctrl_bits[i].str);
+                       separator = "|";
+               }
+       }
+       fputc('\n', file);
+}
 
 /* print a ascii version of a security descriptor on a FILE handle */
 static void sec_desc_print(struct cli_state *cli, FILE *f, struct security_descriptor *sd)
@@ -633,7 +765,7 @@ static void sec_desc_print(struct cli_state *cli, FILE *f, struct security_descr
        uint32 i;
 
        fprintf(f, "REVISION:%d\n", sd->revision);
-       fprintf(f, "CONTROL:0x%x\n", sd->type);
+       print_acl_ctrl(f, sd->type);
 
        /* Print owner and group sid */
 
@@ -669,22 +801,25 @@ get fileinfo for filename
 static uint16 get_fileinfo(struct cli_state *cli, const char *filename)
 {
        uint16_t fnum = (uint16_t)-1;
-       uint16 mode;
+       uint16 mode = 0;
+       NTSTATUS status;
 
        /* The desired access below is the only one I could find that works
           with NT4, W2KP and Samba */
 
-       if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
-                                          0, FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                          FILE_OPEN, 0x0, 0x0, &fnum))) {
-               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+       status = cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+               return 0;
        }
 
-       if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
-                                    cli, fnum, &mode, NULL, NULL, NULL,
-                                    NULL, NULL, NULL))) {
+       status = cli_qfileinfo_basic(cli, fnum, &mode, NULL, NULL, NULL,
+                                    NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to file info %s: %s\n", filename,
-                                                       cli_errstr(cli));
+                      nt_errstr(status));
         }
 
        cli_close(cli, fnum);
@@ -699,23 +834,26 @@ static struct security_descriptor *get_secdesc(struct cli_state *cli, const char
 {
        uint16_t fnum = (uint16_t)-1;
        struct security_descriptor *sd;
+       NTSTATUS status;
 
        /* The desired access below is the only one I could find that works
           with NT4, W2KP and Samba */
 
-       if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
-                                          0, FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                          FILE_OPEN, 0x0, 0x0, &fnum))) {
-               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+       status = cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
                return NULL;
        }
 
-       sd = cli_query_secdesc(cli, fnum, talloc_tos());
+       status = cli_query_secdesc(cli, fnum, talloc_tos(), &sd);
 
        cli_close(cli, fnum);
 
-       if (!sd) {
-               printf("Failed to get security descriptor\n");
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to get security descriptor: %s\n",
+                      nt_errstr(status));
                return NULL;
        }
         return sd;
@@ -729,21 +867,24 @@ static bool set_secdesc(struct cli_state *cli, const char *filename,
 {
        uint16_t fnum = (uint16_t)-1;
         bool result=true;
+       NTSTATUS status;
 
        /* The desired access below is the only one I could find that works
           with NT4, W2KP and Samba */
 
-       if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0,
-                                          WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS,
-                                          0, FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                          FILE_OPEN, 0x0, 0x0, &fnum))) {
-               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+       status = cli_ntcreate(cli, filename, 0,
+                             WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
                return false;
        }
 
-       if (!cli_set_secdesc(cli, fnum, sd)) {
+       status = cli_set_secdesc(cli, fnum, sd);
+       if (!NT_STATUS_IS_OK(status)) {
                printf("ERROR: security description set failed: %s\n",
-                       cli_errstr(cli));
+                       nt_errstr(status));
                result=false;
        }
 
@@ -756,25 +897,29 @@ dump the acls for a file
 *******************************************************/
 static int cacl_dump(struct cli_state *cli, const char *filename)
 {
-       int result = EXIT_FAILED;
        struct security_descriptor *sd;
 
-       if (test_args)
+       if (test_args) {
                return EXIT_OK;
+       }
 
        sd = get_secdesc(cli, filename);
+       if (sd == NULL) {
+               return EXIT_FAILED;
+       }
 
-       if (sd) {
-               if (sddl) {
-                       printf("%s\n", sddl_encode(talloc_tos(), sd,
-                                          get_global_sam_sid()));
-               } else {
-                       sec_desc_print(cli, stdout, sd);
+       if (sddl) {
+               char *str = sddl_encode(talloc_tos(), sd, get_domain_sid(cli));
+               if (str == NULL) {
+                       return EXIT_FAILED;
                }
-               result = EXIT_OK;
+               printf("%s\n", str);
+               TALLOC_FREE(str);
+       } else {
+               sec_desc_print(cli, stdout, sd);
        }
 
-       return result;
+       return EXIT_OK;
 }
 
 /***************************************************** 
@@ -885,7 +1030,7 @@ static int cacl_set(struct cli_state *cli, const char *filename,
        int result = EXIT_OK;
 
        if (sddl) {
-               sd = sddl_decode(talloc_tos(), the_acl, get_global_sam_sid());
+               sd = sddl_decode(talloc_tos(), the_acl, get_domain_sid(cli));
        } else {
                sd = sec_desc_parse(talloc_tos(), cli, the_acl);
        }
@@ -1027,12 +1172,15 @@ static int inherit(struct cli_state *cli, const char *filename,
                        }
                        string_replace(parentname, '/', '\\');
                        parent = get_secdesc(cli,parentname);
+                       if (parent == NULL) {
+                               return EXIT_FAILED;
+                       }
                        for (i=0;i<parent->dacl->num_aces;i++) {
                                struct security_ace *ace=&parent->dacl->aces[i];
                                /* Add inherited flag to all aces */
                                ace->flags=ace->flags|
                                           SEC_ACE_FLAG_INHERITED_ACE;
-                               if ((oldattr & aDIR) == aDIR) {
+                               if ((oldattr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) {
                                        if ((ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) ==
                                            SEC_ACE_FLAG_CONTAINER_INHERIT) {
                                                add_ace(&old->dacl, ace);
@@ -1114,12 +1262,9 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
                                     const char *server, const char *share)
 {
        struct cli_state *c = NULL;
-       struct sockaddr_storage ss;
        NTSTATUS nt_status;
        uint32_t flags = 0;
 
-       zero_sockaddr(&ss);
-
        if (get_cmdline_auth_info_use_kerberos(auth_info)) {
                flags |= CLI_FULL_CONNECTION_USE_KERBEROS |
                         CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
@@ -1132,15 +1277,14 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
 
        set_cmdline_auth_info_getpass(auth_info);
 
-       nt_status = cli_full_connection(&c, global_myname(), server, 
-                               &ss, 0,
+       nt_status = cli_full_connection(&c, lp_netbios_name(), server,
+                               NULL, 0,
                                share, "?????",
                                get_cmdline_auth_info_username(auth_info),
                                lp_workgroup(),
                                get_cmdline_auth_info_password(auth_info),
                                flags,
-                               get_cmdline_auth_info_signing_state(auth_info),
-                               NULL);
+                               get_cmdline_auth_info_signing_state(auth_info));
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status)));
                return NULL;
@@ -1187,6 +1331,7 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
                { "numeric", 0, POPT_ARG_NONE, &numeric, 1, "Don't resolve sids or masks to names" },
                { "sddl", 0, POPT_ARG_NONE, &sddl, 1, "Output and input acls in sddl format" },
                { "test-args", 't', POPT_ARG_NONE, &test_args, 1, "Test arguments"},
+               { "domain-sid", 0, POPT_ARG_STRING, &domain_sid, 0, "Domain SID for sddl", "SID"},
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
@@ -1201,15 +1346,13 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
 
        load_case_tables();
 
-
        /* set default debug level to 1 regardless of what smb.conf sets */
        setup_logging( "smbcacls", DEBUG_STDERR);
-       DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
-       AllowDebugChange = false;
+       lp_set_cmdline("log level", "1");
 
        setlinebuf(stdout);
 
-       lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+       lp_load_global(get_dyn_CONFIGFILE());
        load_interfaces();
 
        auth_info = user_auth_info_init(frame);