summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2012-12-07 12:33:38 +0100
committerMichael Adam <obnox@samba.org>2013-01-29 15:37:18 +0100
commitbab61a21595070d29fc5822d1ec6747db641d26a (patch)
tree41de67189a9aca4cd54e7de78d3a28ea25a6be9f
parent3a4ed4803f2b911e58420531548cb5658cb9fb74 (diff)
downloadsamba-bab61a21595070d29fc5822d1ec6747db641d26a.tar.gz
samba-bab61a21595070d29fc5822d1ec6747db641d26a.tar.bz2
samba-bab61a21595070d29fc5822d1ec6747db641d26a.zip
s3:utils/net remove aclmapset command
this was made for the nfs4:sidmap code that has been removed, so this subcommand can also go away Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Tue Jan 29 15:37:18 CET 2013 on sn-devel-104
-rw-r--r--source3/utils/net_idmap.c73
1 files changed, 0 insertions, 73 deletions
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index f8818328df..1190627ff7 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -706,71 +706,6 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
return net_idmap_check_db(dbfile, &opts);
}
-static int net_idmap_aclmapset(struct net_context *c, int argc, const char **argv)
-{
- TALLOC_CTX *mem_ctx;
- int result = -1;
- struct dom_sid src_sid, dst_sid;
- char *src, *dst;
- struct db_context *db;
- struct db_record *rec;
- NTSTATUS status;
-
- if (argc != 3 || c->display_usage) {
- d_fprintf(stderr, "%s net idmap aclmapset <tdb> "
- "<src-sid> <dst-sid>\n", _("Usage:"));
- return -1;
- }
-
- if (!(mem_ctx = talloc_init("net idmap aclmapset"))) {
- d_fprintf(stderr, _("talloc_init failed\n"));
- return -1;
- }
-
- if (!(db = db_open(mem_ctx, argv[0], 0, TDB_DEFAULT,
- O_RDWR|O_CREAT, 0600,
- DBWRAP_LOCK_ORDER_1))) {
- d_fprintf(stderr, _("db_open failed: %s\n"), strerror(errno));
- goto fail;
- }
-
- if (!string_to_sid(&src_sid, argv[1])) {
- d_fprintf(stderr, _("%s is not a valid sid\n"), argv[1]);
- goto fail;
- }
-
- if (!string_to_sid(&dst_sid, argv[2])) {
- d_fprintf(stderr, _("%s is not a valid sid\n"), argv[2]);
- goto fail;
- }
-
- if (!(src = sid_string_talloc(mem_ctx, &src_sid))
- || !(dst = sid_string_talloc(mem_ctx, &dst_sid))) {
- d_fprintf(stderr, _("talloc_strdup failed\n"));
- goto fail;
- }
-
- if (!(rec = dbwrap_fetch_locked(
- db, mem_ctx, string_term_tdb_data(src)))) {
- d_fprintf(stderr, _("could not fetch db record\n"));
- goto fail;
- }
-
- status = dbwrap_record_store(rec, string_term_tdb_data(dst), 0);
- TALLOC_FREE(rec);
-
- if (!NT_STATUS_IS_OK(status)) {
- d_fprintf(stderr, _("could not store record: %s\n"),
- nt_errstr(status));
- goto fail;
- }
-
- result = 0;
-fail:
- TALLOC_FREE(mem_ctx);
- return result;
-}
-
/***********************************************************
Look at the current idmap
**********************************************************/
@@ -818,14 +753,6 @@ int net_idmap(struct net_context *c, int argc, const char **argv)
" Set secret for specified domain")
},
{
- "aclmapset",
- net_idmap_aclmapset,
- NET_TRANSPORT_LOCAL,
- N_("Set acl map"),
- N_("net idmap aclmapset\n"
- " Set acl map")
- },
- {
"check",
net_idmap_check,
NET_TRANSPORT_LOCAL,