s4: popt: Global replace of cmdline_credentials -> popt_get_cmdline_credentials().

[gd/samba-autobuild/.git] / source4 / torture / libnetapi / libnetapi.c

diff --git a/source4/torture/libnetapi/libnetapi.c b/source4/torture/libnetapi/libnetapi.c
index c3a27eba0c04f762faea70166032b9bd2d52aa3c..dc48caf60318966b352c65e35db5b8997450e12b 100644 (file)
--- a/source4/torture/libnetapi/libnetapi.c
+++ b/source4/torture/libnetapi/libnetapi.c
@@ -17,11 +17,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "source3/include/includes.h"
 #include "torture/smbtorture.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
-#include <netapi.h>
+#include "source3/lib/netapi/netapi.h"
+#include "source3/lib/netapi/netapi_private.h"
+#include "lib/param/param.h"
 #include "torture/libnetapi/proto.h"
 
 bool torture_libnetapi_init_context(struct torture_context *tctx,
@@ -29,21 +31,31 @@ bool torture_libnetapi_init_context(struct torture_context *tctx,
 {
        NET_API_STATUS status;
        struct libnetapi_ctx *ctx;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       status = libnetapi_init(&ctx);
+       if (!lp_load_global(lpcfg_configfile(tctx->lp_ctx))) {
+               fprintf(stderr, "error loading %s\n", lpcfg_configfile(tctx->lp_ctx));
+               talloc_free(frame);
+               return W_ERROR_V(WERR_GEN_FAILURE);
+       }
+
+       init_names();
+       load_interfaces();
+
+       status = libnetapi_net_init(&ctx);
        if (status != 0) {
+               talloc_free(frame);
                return false;
        }
 
-       libnetapi_set_debuglevel(ctx,
-               talloc_asprintf(ctx, "%d", DEBUGLEVEL));
        libnetapi_set_username(ctx,
-               cli_credentials_get_username(cmdline_credentials));
+               cli_credentials_get_username(popt_get_cmdline_credentials()));
        libnetapi_set_password(ctx,
-               cli_credentials_get_password(cmdline_credentials));
+               cli_credentials_get_password(popt_get_cmdline_credentials()));
 
        *ctx_p = ctx;
 
+       talloc_free(frame);
        return true;
 }
 
@@ -52,29 +64,36 @@ static bool torture_libnetapi_initialize(struct torture_context *tctx)
         NET_API_STATUS status;
        struct libnetapi_ctx *ctx;
 
+       /* We must do this first, as otherwise we fail if we don't
+        * have an smb.conf in the default path (we need to use the
+        * torture smb.conf */
+       torture_assert(tctx, torture_libnetapi_init_context(tctx, &ctx),
+                      "failed to initialize libnetapi");
+
        status = libnetapi_init(&ctx);
-       if (status != 0) {
-               return false;
-       }
+
+       torture_assert(tctx, ctx != NULL, "Failed to get a libnetapi_ctx");
+       torture_assert_int_equal(tctx, status, 0, "libnetapi_init failed despite alredy being set up");
 
        libnetapi_free(ctx);
 
        return true;
 }
 
-NTSTATUS torture_libnetapi_init(void)
+NTSTATUS torture_libnetapi_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite;
 
-       suite = torture_suite_create(talloc_autofree_context(), "NETAPI");
+       suite = torture_suite_create(ctx, "netapi");
 
-       torture_suite_add_simple_test(suite, "GROUP", torture_libnetapi_group);
-       torture_suite_add_simple_test(suite, "USER", torture_libnetapi_user);
-       torture_suite_add_simple_test(suite, "INITIALIZE", torture_libnetapi_initialize);
+       torture_suite_add_simple_test(suite, "server", torture_libnetapi_server);
+       torture_suite_add_simple_test(suite, "group", torture_libnetapi_group);
+       torture_suite_add_simple_test(suite, "user", torture_libnetapi_user);
+       torture_suite_add_simple_test(suite, "initialize", torture_libnetapi_initialize);
 
        suite->description = talloc_strdup(suite, "libnetapi convenience interface tests");
 
-       torture_register_suite(suite);
+       torture_register_suite(ctx, suite);
 
        return NT_STATUS_OK;
 }