smbcacls: Move sec_desc_print 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
index 1b22bb0853c18687a57af0b1077fbfc45c0e0540..7f82969badfc9e970dd6537c333a1184ecf02885 100644 (file)
--- a/source3/include/util_sd.h
+++ b/source3/include/util_sd.h
@@ -31,5 +31,7 @@ void print_ace(struct cli_state *cli, FILE *f, struct security_ace *ace,
               bool numeric);
 bool parse_ace(struct cli_state *cli, struct security_ace *ace,
               const char *orig_str);
+void sec_desc_print(struct cli_state *cli, FILE *f,
+                   struct security_descriptor *sd, bool numeric);
 
 #endif

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 616418af46914285e15aa4065ddba83ee99f64d9..7f5badf876e0cd99a7b576d7415047ecd3e538f6 100644 (file)
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -54,6 +54,29 @@ static const struct perm_value standard_values[] = {
        { NULL, 0 },
 };
 
+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"},
+};
+
 /* Open cli connection and policy handle */
 static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
                                   const struct dom_sid *sid,
@@ -526,3 +549,62 @@ bool parse_ace(struct cli_state *cli, struct security_ace *ace,
        SAFE_FREE(str);
        return True;
 }
+
+static void print_acl_ctrl(FILE *file, uint16_t ctrl, bool numeric)
+{
+       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 */
+void sec_desc_print(struct cli_state *cli, FILE *f,
+                   struct security_descriptor *sd, bool numeric)
+{
+       fstring sidstr;
+       uint32 i;
+
+       fprintf(f, "REVISION:%d\n", sd->revision);
+       print_acl_ctrl(f, sd->type, numeric);
+
+       /* Print owner and group sid */
+
+       if (sd->owner_sid) {
+               SidToString(cli, sidstr, sd->owner_sid, numeric);
+       } else {
+               fstrcpy(sidstr, "");
+       }
+
+       fprintf(f, "OWNER:%s\n", sidstr);
+
+       if (sd->group_sid) {
+               SidToString(cli, sidstr, sd->group_sid, numeric);
+       } else {
+               fstrcpy(sidstr, "");
+       }
+
+       fprintf(f, "GROUP:%s\n", sidstr);
+
+       /* Print aces */
+       for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
+               struct security_ace *ace = &sd->dacl->aces[i];
+               fprintf(f, "ACL:");
+               print_ace(cli, f, ace, numeric);
+               fprintf(f, "\n");
+       }
+
+}

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 9081ebf70f18285364bc01c710af57f1613f73be..926e496ef6ca3e436a03e2232c711a299b65167f 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -215,87 +215,6 @@ 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, bool numeric)
-{
-       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, bool numeric)
-{
-       fstring sidstr;
-       uint32 i;
-
-       fprintf(f, "REVISION:%d\n", sd->revision);
-       print_acl_ctrl(f, sd->type, numeric);
-
-       /* Print owner and group sid */
-
-       if (sd->owner_sid) {
-               SidToString(cli, sidstr, sd->owner_sid, numeric);
-       } else {
-               fstrcpy(sidstr, "");
-       }
-
-       fprintf(f, "OWNER:%s\n", sidstr);
-
-       if (sd->group_sid) {
-               SidToString(cli, sidstr, sd->group_sid, numeric);
-       } else {
-               fstrcpy(sidstr, "");
-       }
-
-       fprintf(f, "GROUP:%s\n", sidstr);
-
-       /* Print aces */
-       for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-               struct security_ace *ace = &sd->dacl->aces[i];
-               fprintf(f, "ACL:");
-               print_ace(cli, f, ace, numeric);
-               fprintf(f, "\n");
-       }
-
-}
-
 /*****************************************************
 get fileinfo for filename
 *******************************************************/