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

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

diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c
index fbfdced2f84e6227f96ba59692b0268ad26d9c94..c96e970d061d0f7e440bf0561edccf498903a4d5 100644 (file)
--- a/source4/torture/raw/session.c
+++ b/source4/torture/raw/session.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "torture.h"
-#include "smb_cli.h"
+#include "libcli/libcli.h"
 #include "torture/raw/proto.h"
 #include "smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
@@ -63,7 +63,7 @@ static bool test_session_reauth1(struct torture_context *tctx,
        ZERO_STRUCT(io);
        io.in.sesskey         = cli->transport->negotiate.sesskey;
        io.in.capabilities    = cli->transport->negotiate.capabilities;
-       io.in.credentials     = cmdline_credentials;
+       io.in.credentials     = popt_get_cmdline_credentials();
        io.in.workgroup       = lpcfg_workgroup(tctx->lp_ctx);
        io.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
        status = smb_composite_sesssetup(cli->session, &io);
@@ -205,7 +205,7 @@ static bool test_session_reauth2(struct torture_context *tctx,
        ZERO_STRUCT(io_sesssetup);
        io_sesssetup.in.sesskey      = cli->transport->negotiate.sesskey;
        io_sesssetup.in.capabilities = cli->transport->negotiate.capabilities;
-       io_sesssetup.in.credentials  = cmdline_credentials;
+       io_sesssetup.in.credentials  = popt_get_cmdline_credentials();
        io_sesssetup.in.workgroup    = lpcfg_workgroup(tctx->lp_ctx);
        io_sesssetup.in.gensec_settings = lpcfg_gensec_settings(
                tctx, tctx->lp_ctx);
@@ -234,13 +234,13 @@ static bool test_session_expire1(struct torture_context *tctx)
        struct smbcli_session_options session_options;
        const char *host = torture_setting_string(tctx, "host", NULL);
        const char *share = torture_setting_string(tctx, "share", NULL);
-       struct cli_credentials *credentials = cmdline_credentials;
+       struct cli_credentials *credentials = popt_get_cmdline_credentials();
        struct smbcli_state *cli = NULL;
        enum credentials_use_kerberos use_kerberos;
        char fname[256];
        union smb_fileinfo qfinfo;
        uint16_t vuid;
-       uint16_t fnum;
+       uint16_t fnum = 0;
        struct smb_composite_sesssetup io_sesssetup;
        size_t i;
 
@@ -304,8 +304,8 @@ static bool test_session_expire1(struct torture_context *tctx)
                torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
                                                "raw_fileinfo failed");
 
-               torture_comment(tctx, "sleep 5 seconds\n");
-               smb_msleep(5*1000);
+               torture_comment(tctx, "sleep 10 seconds\n");
+               smb_msleep(10*1000);
        }
 
        /*
@@ -343,8 +343,8 @@ static bool test_session_expire1(struct torture_context *tctx)
                torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
                                                "raw_fileinfo failed");
 
-               torture_comment(tctx, "sleep 5 seconds\n");
-               smb_msleep(5*1000);
+               torture_comment(tctx, "sleep 10 seconds\n");
+               smb_msleep(10*1000);
 
                torture_comment(tctx, "query info => EXPIRED\n");
                ZERO_STRUCT(qfinfo.access_information.out);