samba-tool: Remove password as it has been moved to "user setpassword"

The password functionality has been moved to "user setpassword" to fit the object-action model

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source4/samba_tool/password.c b/source4/samba_tool/password.c
deleted file mode 100644 (file)
index 47d8f1f..0000000
--- a/source4/samba_tool/password.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Samba Unix/Linux SMB client library
-   Distributed SMB/CIFS Server Management Utility
-
-   Copyright (C) 2004 Stefan Metzmacher (metze@samba.org)
-
-   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 "samba_tool/samba_tool.h"
-#include "libnet/libnet.h"
-#include "system/filesys.h"
-#include "lib/events/events.h"
-#include "auth/credentials/credentials.h"
-
-/*
- * Code for Changing and setting a password
- */
-
-static int net_password_change_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("samba-tool password change [options]\n");
-       return 0;
-}
-
-
-static int net_password_change(struct net_context *ctx, int argc, const char **argv)
-{
-       NTSTATUS status;
-       struct libnet_context *libnetctx;
-       union libnet_ChangePassword r;
-       char *password_prompt = NULL;
-       const char *new_password;
-
-       if (argc > 0 && argv[0]) {
-               new_password = argv[0];
-       } else {
-               password_prompt = talloc_asprintf(ctx, "Enter new password for account [%s\\%s]:",
-                                                       cli_credentials_get_domain(ctx->credentials),
-                                                       cli_credentials_get_username(ctx->credentials));
-               new_password = getpass(password_prompt);
-       }
-
-       libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx);
-       if (!libnetctx) {
-               return -1;
-       }
-       libnetctx->cred = ctx->credentials;
-
-       /* prepare password change */
-       r.generic.level                 = LIBNET_CHANGE_PASSWORD_GENERIC;
-       r.generic.in.account_name       = cli_credentials_get_username(ctx->credentials);
-       r.generic.in.domain_name        = cli_credentials_get_domain(ctx->credentials);
-       r.generic.in.oldpassword        = cli_credentials_get_password(ctx->credentials);
-       r.generic.in.newpassword        = new_password;
-
-       /* do password change */
-       status = libnet_ChangePassword(libnetctx, ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("net_password_change: %s\n",r.generic.out.error_string));
-               return -1;
-       }
-
-       talloc_free(libnetctx);
-
-       return 0;
-}
-
-
-static int net_password_set_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("samba-tool password set <username> [<password>] [options]\n");
-       return 0;
-}
-
-
-static int net_password_set(struct net_context *ctx, int argc, const char **argv)
-{
-       NTSTATUS status;
-       struct libnet_context *libnetctx;
-       union libnet_SetPassword r;
-       char *password_prompt = NULL;
-       char *p;
-       char *tmp;
-       const char *account_name;
-       const char *domain_name;
-       const char *new_password = NULL;
-
-       switch (argc) {
-               case 0: /* no args -> fail */
-                       return net_password_set_usage(ctx, argc, argv);
-               case 1: /* only DOM\\user; prompt for password */
-                       tmp = talloc_strdup(ctx, argv[0]);
-                       break;
-               case 2: /* DOM\\USER and password */
-                       tmp = talloc_strdup(ctx, argv[0]);
-                       new_password = argv[1];
-                       break;
-               default: /* too mayn args -> fail */
-                       DEBUG(0,("samba-tool password set: too many args [%d]\n",argc));
-                       return net_password_set_usage(ctx, argc, argv);
-       }
-
-       if ((p = strchr_m(tmp,'\\'))) {
-               *p = 0;
-               domain_name = tmp;
-               account_name = talloc_strdup(ctx, p+1);
-       } else {
-               account_name = tmp;
-               domain_name = cli_credentials_get_domain(ctx->credentials);
-       }
-
-       if (!new_password) {
-               password_prompt = talloc_asprintf(ctx, "Enter new password for account [%s\\%s]:",
-                                                       domain_name, account_name);
-               new_password = getpass(password_prompt);
-       }
-
-       libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx);
-       if (!libnetctx) {
-               return -1;
-       }
-       libnetctx->cred = ctx->credentials;
-
-       /* prepare password change */
-       r.generic.level                 = LIBNET_SET_PASSWORD_GENERIC;
-       r.generic.in.account_name       = account_name;
-       r.generic.in.domain_name        = domain_name;
-       r.generic.in.newpassword        = new_password;
-
-       /* do password change */
-       status = libnet_SetPassword(libnetctx, ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("net_password_set: %s\n",r.generic.out.error_string));
-               return -1;
-       }
-
-       talloc_free(libnetctx);
-
-       return 0;
-}
-
-
-static const struct net_functable net_password_functable[] = {
-       {"change", "change password (old password required)\n", net_password_change, net_password_change_usage },
-       {"set", "set password\n", net_password_set, net_password_set_usage },
-       {NULL, NULL}
-};
-
-int net_password(struct net_context *ctx, int argc, const char **argv)
-{
-       return net_run_function(ctx, argc, argv, net_password_functable, net_password_usage);
-}
-
-int net_password_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("samba-tool password <command> [options]\n");
-       d_printf("available commands:\n");
-       net_password_change_usage(ctx, argc, argv);
-       net_password_set_usage(ctx, argc, argv);
-       return 0;
-}

diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c
index ce2294442035e9cbc293b547cdffb67e71cd14c4..3c0f96f236d20de3b9306b3c5ea360763564163b 100644 (file)
--- a/source4/samba_tool/samba_tool.c
+++ b/source4/samba_tool/samba_tool.c
@@ -7,6 +7,7 @@
    Copyright (C) 2001 Andrew Bartlett (abartlet@samba.org)
    Copyright (C) 2004 Stefan Metzmacher (metze@samba.org)
    Copyright (C) 2009 Jelmer Vernooij (jelmer@samba.org)
+   Copyright (C) 2011 Giampaolo Lauria (lauria2@yahoo.com)
 
    Largely rewritten by metze in August 2004
 
@@ -195,7 +196,6 @@ int net_run_usage(struct net_context *ctx,
 
 /* main function table */
 static const struct net_functable net_functable[] = {
-       {"password", "Changes/Sets the password on a user account [server connection needed]\n", net_password, net_password_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},
        {"gpo", "Administer group policies\n", net_gpo, net_gpo_usage},

diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build
index 75ff71f5e4b269d791a1a82cee563d4c710ecccc..788f8dbf7543c54e133794e9ba3827a927325604 100644 (file)
--- a/source4/samba_tool/wscript_build
+++ b/source4/samba_tool/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 bld.SAMBA_BINARY('samba-tool',
-       source='samba_tool.c password.c vampire.c gpo.c',
+       source='samba_tool.c vampire.c gpo.c',
        autoproto='proto.h',
        deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS samba-policy auth4',
        pyembed=True