git.samba.org / amitay / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3:net: fix some i18n messages in net_registry_getsd_internal().
[amitay/samba.git] / source3 / utils / net_registry.c
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 3958d2165d1dba3c3cad64cd6f567c055357dda8..1006079a0332aa43d0542766a88034e227aca3d6 100644 (file)
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -130,9 +130,12 @@ static int net_registry_enumerate(struct net_context *c, int argc,
        int ret = -1;
 
        if (argc != 1 || c->display_usage) {
-               d_printf(_("Usage:"),_("    net registry enumerate <path>\n"));
-               d_printf(_("Example:"), _("  net registry enumerate "
-                        "'HKLM\\Software\\Samba'\n"));
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net registry enumerate <path>\n"));
+               d_printf("%s\n%s",
+                        _("Example:"),
+                        _("net registry enumerate 'HKLM\\Software\\Samba'\n"));
                goto done;
        }
 
@@ -182,9 +185,13 @@ static int net_registry_createkey(struct net_context *c, int argc,
        int ret = -1;
 
        if (argc != 1 || c->display_usage) {
-               d_printf(_("Usage:"),_("    net registry createkey <path>\n"));
-               d_printf(_("Example:"), _("  net registry createkey "
-                        "'HKLM\\Software\\Samba\\smbconf.127.0.0.1'\n"));
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net registry createkey <path>\n"));
+               d_printf("%s\n%s",
+                        _("Example:"),
+                        _("net registry createkey "
+                          "'HKLM\\Software\\Samba\\smbconf.127.0.0.1'\n"));
                goto done;
        }
        if (strlen(argv[0]) == 0) {
@@ -235,8 +242,12 @@ static int net_registry_deletekey(struct net_context *c, int argc,
        int ret = -1;
 
        if (argc != 1 || c->display_usage) {
-               d_printf(_("Usage:"),_("    net registry deletekey <path>\n"));
-               d_printf(_("Example:"),_("  net registry deletekey "
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net registry deletekey <path>\n"));
+               d_printf("%s\n%s",
+                        _("Example:"),
+                        _("net registry deletekey "
                           "'HKLM\\Software\\Samba\\smbconf.127.0.0.1'\n"));
                goto done;
        }
@@ -247,14 +258,14 @@ static int net_registry_deletekey(struct net_context *c, int argc,
 
        werr = open_hive(ctx, argv[0], REG_KEY_WRITE, &hivekey, &subkeyname);
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr, "open_hive ", _("failed"),
-                       ": %s\n", win_errstr(werr));
+               d_fprintf(stderr, "open_hive %s: %s\n", _("failed"),
+                         win_errstr(werr));
                goto done;
        }
 
        werr = reg_deletekey(hivekey, subkeyname);
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr, "reg_deletekey ", _("failed"), ": %s\n",
+               d_fprintf(stderr, "reg_deletekey %s: %s\n", _("failed"),
                          win_errstr(werr));
                goto done;
        }
@@ -276,8 +287,9 @@ static int net_registry_getvalue_internal(struct net_context *c, int argc,
        TALLOC_CTX *ctx = talloc_stackframe();
 
        if (argc != 2 || c->display_usage) {
-               d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue <key> "
-                                   "<valuename>\n"));
+               d_fprintf(stderr, "%s\n%s",
+                         _("Usage:"),
+                         _("net rpc registry getvalue <key> <valuename>\n"));
                goto done;
        }
 
@@ -325,8 +337,10 @@ static int net_registry_setvalue(struct net_context *c, int argc,
        TALLOC_CTX *ctx = talloc_stackframe();
 
        if (argc < 4 || c->display_usage) {
-               d_fprintf(stderr, _("Usage:"),_(" net rpc registry setvalue <key> "
-                         "<valuename> <type> [<val>]+\n"));
+               d_fprintf(stderr, "%s\n%s",
+                         _("Usage:"),
+                         _("net rpc registry setvalue <key> <valuename> "
+                           "<type> [<val>]+\n"));
                goto done;
        }
 
@@ -380,8 +394,9 @@ static int net_registry_deletevalue(struct net_context *c, int argc,
        int ret = -1;
 
        if (argc != 2 || c->display_usage) {
-               d_fprintf(stderr, _("Usage:"),_(" net rpc registry deletevalue <key> "
-                         "<valuename>\n"));
+               d_fprintf(stderr, "%s\n%s",
+                         _("Usage:"),
+                         _("net rpc registry deletevalue <key> <valuename>\n"));
                goto done;
        }
 
@@ -405,13 +420,13 @@ done:
        return ret;
 }
 
-static int net_registry_getsd(struct net_context *c, int argc,
-                             const char **argv)
+static WERROR net_registry_getsd_internal(struct net_context *c,
+                                         TALLOC_CTX *mem_ctx,
+                                         const char *keyname,
+                                         struct security_descriptor **sd)
 {
        WERROR werr;
-       int ret = -1;
        struct registry_key *key = NULL;
-       struct security_descriptor *secdesc = NULL;
        TALLOC_CTX *ctx = talloc_stackframe();
        uint32_t access_mask = REG_KEY_READ |
                               SEC_FLAG_MAXIMUM_ALLOWED |
@@ -423,30 +438,62 @@ static int net_registry_getsd(struct net_context *c, int argc,
         */
        access_mask = REG_KEY_READ;
 
-       if (argc != 1 || c->display_usage) {
-               d_printf(_("Usage:"),_("    net registry getsd <path>\n"));
-               d_printf(_("Example:"),_("  net registry getsd "
-                          "'HKLM\\Software\\Samba'\n"));
+       if (sd == NULL) {
+               d_fprintf(stderr, _("internal error: invalid argument\n"));
+               werr = WERR_INVALID_PARAM;
                goto done;
        }
-       if (strlen(argv[0]) == 0) {
-               d_fprintf(stderr, "error: zero length key name given\n");
+
+       if (strlen(keyname) == 0) {
+               d_fprintf(stderr, _("error: zero length key name given\n"));
+               werr = WERR_INVALID_PARAM;
                goto done;
        }
 
-       werr = open_key(ctx, argv[0], access_mask, &key);
+       werr = open_key(ctx, keyname, access_mask, &key);
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr, _("open_key failed: %s\n"), win_errstr(werr));
+               d_fprintf(stderr, "%s%s\n", _("open_key failed: "),
+                         win_errstr(werr));
                goto done;
        }
 
-       werr = reg_getkeysecurity(ctx, key, &secdesc);
+       werr = reg_getkeysecurity(mem_ctx, key, sd);
        if (!W_ERROR_IS_OK(werr)) {
-               d_fprintf(stderr, _("reg_getkeysecurity failed: %s\n"),
+               d_fprintf(stderr, "%s%s\n", _("reg_getkeysecurity failed: "),
                          win_errstr(werr));
                goto done;
        }
 
+       werr = WERR_OK;
+
+done:
+       TALLOC_FREE(ctx);
+       return werr;
+}
+
+static int net_registry_getsd(struct net_context *c, int argc,
+                             const char **argv)
+{
+       WERROR werr;
+       int ret = -1;
+       struct security_descriptor *secdesc = NULL;
+       TALLOC_CTX *ctx = talloc_stackframe();
+
+       if (argc != 1 || c->display_usage) {
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net registry getsd <path>\n"));
+               d_printf("%s\n%s",
+                        _("Example:"),
+                        _("net registry getsd 'HKLM\\Software\\Samba'\n"));
+               goto done;
+       }
+
+       werr = net_registry_getsd_internal(c, ctx, argv[0], &secdesc);
+       if (!W_ERROR_IS_OK(werr)) {
+               goto done;
+       }
+
        display_sec_desc(secdesc);
 
        ret = 0;
@@ -456,6 +503,38 @@ done:
        return ret;
 }
 
+static int net_registry_getsd_sddl(struct net_context *c,
+                                  int argc, const char **argv)
+{
+       WERROR werr;
+       int ret = -1;
+       struct security_descriptor *secdesc = NULL;
+       TALLOC_CTX *ctx = talloc_stackframe();
+
+       if (argc != 1 || c->display_usage) {
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net registry getsd_sddl <path>\n"));
+               d_printf("%s\n%s",
+                        _("Example:"),
+                        _("net registry getsd_sddl 'HKLM\\Software\\Samba'\n"));
+               goto done;
+       }
+
+       werr = net_registry_getsd_internal(c, ctx, argv[0], &secdesc);
+       if (!W_ERROR_IS_OK(werr)) {
+               goto done;
+       }
+
+       d_printf("%s\n", sddl_encode(ctx, secdesc, get_global_sam_sid()));
+
+       ret = 0;
+
+done:
+       TALLOC_FREE(ctx);
+       return ret;
+}
+
 int net_registry(struct net_context *c, int argc, const char **argv)
 {
        int ret = -1;
@@ -525,6 +604,14 @@ int net_registry(struct net_context *c, int argc, const char **argv)
                        N_("net registry getsd\n"
                           "    Get security descriptor")
                },
+               {
+                       "getsd_sddl",
+                       net_registry_getsd_sddl,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Get security descriptor in sddl format"),
+                       N_("net registry getsd_sddl\n"
+                          "    Get security descriptor in sddl format")
+               },
        { NULL, NULL, 0, NULL, NULL }
        };
 
Amitay's Samba development tree