r12608: Remove some unused #include lines.

[abartlet/samba.git/.git] / source4 / utils / net / net_password.c

diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c
index 5da18d94b5835a291f3b2a567166e43468885239..8f6b989a5dafe3e8fa445510887431ce3481a6de 100644 (file)
--- a/source4/utils/net/net_password.c
+++ b/source4/utils/net/net_password.c
@@ -20,11 +20,20 @@
 */
 
 #include "includes.h"
+#include "utils/net/net.h"
+#include "libnet/libnet.h"
+#include "system/filesys.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("net_password_change_usage: TODO\n");
+       return 0;       
+}
+
 
 static int net_password_change(struct net_context *ctx, int argc, const char **argv)
 {
@@ -38,23 +47,22 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a
                new_password = argv[0];
        } else {
                password_prompt = talloc_asprintf(ctx->mem_ctx, "Enter new password for account [%s\\%s]:", 
-                                                       ctx->user.domain_name, ctx->user.account_name);
+                                                       cli_credentials_get_domain(ctx->credentials), 
+                                                       cli_credentials_get_username(ctx->credentials));
                new_password = getpass(password_prompt);
        }
 
-       libnetctx = libnet_context_init();
+       libnetctx = libnet_context_init(NULL);
        if (!libnetctx) {
                return -1;      
        }
-       libnetctx->user.account_name    = ctx->user.account_name;
-       libnetctx->user.domain_name     = ctx->user.domain_name;
-       libnetctx->user.password        = ctx->user.password;
+       libnetctx->cred = ctx->credentials;
 
        /* prepare password change */
        r.generic.level                 = LIBNET_CHANGE_PASSWORD_GENERIC;
-       r.generic.in.account_name       = ctx->user.account_name;
-       r.generic.in.domain_name        = ctx->user.domain_name;
-       r.generic.in.oldpassword        = ctx->user.password;
+       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 */
@@ -64,23 +72,19 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a
                return -1;
        }
 
-       libnet_context_destroy(&libnetctx);
+       talloc_free(libnetctx);
 
        return 0;
 }
 
-static int net_password_change_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("net_password_change_usage: TODO\n");
-       return 0;       
-}
 
-static int net_password_change_help(struct net_context *ctx, int argc, const char **argv)
+static int net_password_set_usage(struct net_context *ctx, int argc, const char **argv)
 {
-       d_printf("net_password_change_help: TODO\n");
+       d_printf("net_password_set_usage: TODO\n");
        return 0;       
 }
 
+
 static int net_password_set(struct net_context *ctx, int argc, const char **argv)
 {
        NTSTATUS status;
@@ -95,8 +99,7 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
 
        switch (argc) {
                case 0: /* no args -> fail */
-                       DEBUG(0,("net_password_set: no args\n"));
-                       return -1;
+                       return net_password_set_usage(ctx, argc, argv);
                case 1: /* only DOM\\user; prompt for password */
                        tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
                        break;
@@ -106,7 +109,7 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
                        break;
                default: /* too mayn args -> fail */
                        DEBUG(0,("net_password_set: too many args [%d]\n",argc));
-                       return -1;
+                       return net_password_usage(ctx, argc, argv);
        }
 
        if ((p = strchr_m(tmp,'\\'))) {
@@ -115,7 +118,7 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
                account_name = talloc_strdup(ctx->mem_ctx, p+1);
        } else {
                account_name = tmp;
-               domain_name = ctx->user.domain_name;
+               domain_name = cli_credentials_get_domain(ctx->credentials);
        }
 
        if (!new_password) {
@@ -124,13 +127,11 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
                new_password = getpass(password_prompt);
        }
 
-       libnetctx = libnet_context_init();
+       libnetctx = libnet_context_init(NULL);
        if (!libnetctx) {
                return -1;      
        }
-       libnetctx->user.account_name    = ctx->user.account_name;
-       libnetctx->user.domain_name     = ctx->user.domain_name;
-       libnetctx->user.password        = ctx->user.password;
+       libnetctx->cred = ctx->credentials;
 
        /* prepare password change */
        r.generic.level                 = LIBNET_SET_PASSWORD_GENERIC;
@@ -145,26 +146,15 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
                return -1;
        }
 
-       libnet_context_destroy(&libnetctx);
+       talloc_free(libnetctx);
 
        return 0;
 }
 
-static int net_password_set_usage(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("net_password_set_usage: TODO\n");
-       return 0;       
-}
 
-static int net_password_set_help(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("net_password_set_help: TODO\n");
-       return 0;       
-}
-
-static const struct net_functable const net_password_functable[] = {
-       {"change", net_password_change, net_password_change_usage,  net_password_change_help},
-       {"set", net_password_set, net_password_set_usage,  net_password_set_help},
+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}
 };
 
@@ -175,12 +165,6 @@ int net_password(struct net_context *ctx, int argc, const char **argv)
 
 int net_password_usage(struct net_context *ctx, int argc, const char **argv)
 {
-       d_printf("net_password_usage: TODO\n");
-       return 0;       
-}
-
-int net_password_help(struct net_context *ctx, int argc, const char **argv)
-{
-       d_printf("net_password_help: TODO\n");
+       d_printf("net password <command> [options]\n");
        return 0;       
 }