examples/fuse/smb2mount: make use of get_cmdline_auth_info_creds()

[bbaumbach/samba-autobuild/.git] / examples / fuse / smb2mount.c

diff --git a/examples/fuse/smb2mount.c b/examples/fuse/smb2mount.c
index 4ed985f53c4baccbadd7939c9dc27e40a805f932..f095b7da337155f8ca244d53bd9d60de397ef0c0 100644 (file)
--- a/examples/fuse/smb2mount.c
+++ b/examples/fuse/smb2mount.c
@@ -20,7 +20,7 @@
 
 #include "source3/include/includes.h"
 #include "popt.h"
-#include "popt_common.h"
+#include "popt_common_cmdline.h"
 #include "client.h"
 #include "libsmb/proto.h"
 #include "clifuse.h"
@@ -38,12 +38,10 @@ static struct cli_state *connect_one(const struct user_auth_info *auth_info,
                         CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
        }
 
-       nt_status = cli_full_connection(&c, lp_netbios_name(), server,
+       nt_status = cli_full_connection_creds(&c, lp_netbios_name(), server,
                                NULL, port,
                                share, "?????",
-                               get_cmdline_auth_info_username(auth_info),
-                               lp_workgroup(),
-                               get_cmdline_auth_info_password(auth_info),
+                               get_cmdline_auth_info_creds(auth_info),
                                flags,
                                get_cmdline_auth_info_signing_state(auth_info));
        if (!NT_STATUS_IS_OK(nt_status)) {
@@ -53,11 +51,9 @@ static struct cli_state *connect_one(const struct user_auth_info *auth_info,
        }
 
        if (get_cmdline_auth_info_smb_encrypt(auth_info)) {
-               nt_status = cli_cm_force_encryption(
+               nt_status = cli_cm_force_encryption_creds(
                        c,
-                       get_cmdline_auth_info_username(auth_info),
-                       get_cmdline_auth_info_password(auth_info),
-                       lp_workgroup(),
+                       get_cmdline_auth_info_creds(auth_info),
                        share);
                 if (!NT_STATUS_IS_OK(nt_status)) {
                        cli_shutdown(c);
@@ -143,7 +139,7 @@ int main(int argc, char *argv[])
        *share = 0;
        share++;
 
-       cli = connect_one(cmdline_auth_info, server, port, share);
+       cli = connect_one(popt_get_cmdline_auth_info(), server, port, share);
        if (cli == NULL) {
                return -1;
        }
@@ -154,6 +150,7 @@ int main(int argc, char *argv[])
                return -1;
        }
 
+       popt_free_cmdline_auth_info();
        TALLOC_FREE(frame);
        return 0;
 }