s3: client tools. Remove direct access to struct user_auth_info *cmdline_auth_info.

[vlendec/samba-autobuild/.git] / source3 / rpcclient / cmd_spoolss.c

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 34cbb7e0cdb552de2f0f8122250f72da36a5c394..1d24476e9a5e86b5bd06c421062718a42fcbb602 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -33,6 +33,7 @@
 #include "../libcli/security/security_descriptor.h"
 #include "../libcli/registry/util_reg.h"
 #include "libsmb/libsmb.h"
+#include "popt_common.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \
@@ -3495,8 +3496,6 @@ done:
 /****************************************************************************
 ****************************************************************************/
 
-extern struct user_auth_info *rpcclient_auth_info;
-
 static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx, int argc,
                                     const char **argv)
@@ -3519,13 +3518,18 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
        /* first get the connection to the remote server */
 
        nt_status = cli_full_connection(&cli_server2, lp_netbios_name(), argv[2],
-                                       NULL, 0,
-                                       "IPC$", "IPC",
-                                       get_cmdline_auth_info_username(rpcclient_auth_info),
-                                       lp_workgroup(),
-                                       get_cmdline_auth_info_password(rpcclient_auth_info),
-                                       get_cmdline_auth_info_use_kerberos(rpcclient_auth_info) ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
-                                       get_cmdline_auth_info_signing_state(rpcclient_auth_info));
+                               NULL, 0,
+                               "IPC$", "IPC",
+                               get_cmdline_auth_info_username(
+                                       popt_get_cmdline_auth_info()),
+                               lp_workgroup(),
+                               get_cmdline_auth_info_password(
+                                       popt_get_cmdline_auth_info()),
+                               get_cmdline_auth_info_use_kerberos(
+                                       popt_get_cmdline_auth_info()) ?
+                                       CLI_FULL_CONNECTION_USE_KERBEROS : 0,
+                               get_cmdline_auth_info_signing_state(
+                                       popt_get_cmdline_auth_info()));
 
        if ( !NT_STATUS_IS_OK(nt_status) )
                return WERR_GEN_FAILURE;