Getting rid of external credentials in libnetapi.

Guenther
(This used to be commit c10481dba01a084b0f9c4265f3408a0ec9a8b646)

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index bc26c22370f0a94040fd0fb99410206945886c26..8287cd046f1120479c8a19b7c3c33f9f39dcaa41 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -20,10 +20,6 @@
 #include "includes.h"
 #include "lib/netapi/joindomain.h"
 
-extern const char *opt_user_name;
-extern const char *opt_workgroup;
-extern const char *opt_password;
-
 static WERROR NetJoinDomainLocal(TALLOC_CTX *mem_ctx,
                                 const char *server_name,
                                 const char *domain_name,
@@ -219,8 +215,10 @@ WERROR NetUnjoinDomain(const char *server_name,
        status = cli_full_connection(&cli, NULL, server_name,
                                     NULL, 0,
                                     "IPC$", "IPC",
-                                    opt_user_name, opt_workgroup,
-                                    opt_password, 0, Undefined, NULL);
+                                    ctx->username,
+                                    ctx->workgroup,
+                                    ctx->password,
+                                    0, Undefined, NULL);
 
        if (!NT_STATUS_IS_OK(status)) {
                werr = ntstatus_to_werror(status);
@@ -311,8 +309,10 @@ WERROR NetGetJoinInformation(const char *server_name,
        status = cli_full_connection(&cli, NULL, server_name,
                                     NULL, 0,
                                     "IPC$", "IPC",
-                                    opt_user_name, opt_workgroup,
-                                    opt_password, 0, Undefined, NULL);
+                                    ctx->username,
+                                    ctx->workgroup,
+                                    ctx->password,
+                                    0, Undefined, NULL);
 
        if (!NT_STATUS_IS_OK(status)) {
                werr = ntstatus_to_werror(status);

diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index 0810ecb7bc0300d730795c8352f8c8ee3b9fcb1e..0637570c3e65fa505043cd6d8c43b13e7f96248d 100644 (file)
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -22,6 +22,9 @@
 
 struct libnetapi_ctx {
        int debuglevel;
+       char *username;
+       char *workgroup;
+       char *password;
 };
 
 WERROR libnetapi_init(struct libnetapi_ctx **ctx);