3 files changed, 1 insertions, 93 deletions
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 398a4709ae..56f7c77736 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -200,7 +200,6 @@ static const struct net_functable net_functable[] = {
 	{"join", "join a domain\n", net_join, net_join_usage},
 	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
 	{"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
-	{"machinepw", "Get a machine password out of our SAM\n", net_machinepw, net_machinepw_usage},
 	{"drs", "Implements functionality offered by repadmin.exe utility in Windows\n", net_drs, net_drs_usage},
 	{NULL, NULL, NULL, NULL}
 };
diff --git a/source4/utils/net/net_machinepw.c b/source4/utils/net/net_machinepw.c
deleted file mode 100644
index 390eb8df0b..0000000000
--- a/source4/utils/net/net_machinepw.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-   Samba Unix/Linux SMB client library
-   Distributed SMB/CIFS Server Management Utility
-
-   Copyright (C) 2008 Volker Lendecke
-
-   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 "lib/events/events.h"
-#include "utils/net/net.h"
-#include "libnet/libnet.h"
-#include "libcli/security/security.h"
-#include "param/secrets.h"
-#include "param/param.h"
-#include "lib/util/util_ldb.h"
-
-int net_machinepw_usage(struct net_context *ctx, int argc, const char **argv)
-{
-	d_printf("net machinepw <accountname>\n");
-	return -1;
-}
-
-int net_machinepw(struct net_context *ctx, int argc, const char **argv)
-{
-	struct ldb_context *secrets;
-	TALLOC_CTX *mem_ctx;
-	struct tevent_context *ev;
-	struct ldb_message **msgs;
-	int num_records;
-	const char *attrs[] = { "secret", NULL };
-	const char *secret;
-
-	if (argc != 1) {
-		net_machinepw_usage(ctx, argc, argv);
-		return -1;
-	}
-
-	mem_ctx = talloc_new(ctx);
-	if (mem_ctx == NULL) {
-		d_fprintf(stderr, "talloc_new failed\n");
-		return -1;
-	}
-
-	ev = event_context_init(mem_ctx);
-	if (ev == NULL) {
-		d_fprintf(stderr, "event_context_init failed\n");
-		goto fail;
-	}
-
-	secrets = secrets_db_connect(mem_ctx, ev, ctx->lp_ctx);
-	if (secrets == NULL) {
-		d_fprintf(stderr, "secrets_db_connect failed\n");
-		goto fail;
-	}
-
-	num_records = gendb_search(secrets, mem_ctx, NULL, &msgs, attrs,
-				   "(&(objectclass=primaryDomain)"
-				   "(samaccountname=%s))", argv[0]);
-	if (num_records != 1) {
-		d_fprintf(stderr, "gendb_search returned %d records, "
-			  "expected 1\n", num_records);
-		goto fail;
-	}
-
-	secret = ldb_msg_find_attr_as_string(msgs[0], "secret", NULL);
-	if (secret == NULL) {
-		d_fprintf(stderr, "machine account contains no secret\n");
-		goto fail;
-	}
-
-	printf("%s\n", secret);
-	talloc_free(mem_ctx);
-	return 0;
-
- fail:
-	talloc_free(mem_ctx);
-	return -1;
-}
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index a7cdb10c2c..af1a0c931c 100644
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_MODULE('net_drs',
 
 
 bld.SAMBA_BINARY('net',
-	source='net.c net_machinepw.c net_password.c net_join.c net_vampire.c',
+	source='net.c net_password.c net_join.c net_vampire.c',
 	autoproto='net_proto.h',
 	installdir='BINDIR',
 	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs',