From c11d52c7f6b560fe66a2f197e30602d57370fd5c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 5 May 2011 00:51:12 +0200 Subject: s3-rpcclient: run minimal_includes.pl. Guenther --- source3/rpcclient/cmd_spoolss.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/rpcclient/cmd_spoolss.c') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 712b23724ec..3d5f23a6e7e 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -27,7 +27,6 @@ #include "../librpc/gen_ndr/ndr_spoolss_c.h" #include "rpc_client/cli_spoolss.h" #include "rpc_client/init_spoolss.h" -#include "registry.h" #include "registry/reg_objects.h" #include "nt_printing.h" #include "../libcli/security/display_sec.h" -- cgit From 27022587e31769718ab53f4d114e03ac2f205f27 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 6 May 2011 11:47:43 +0200 Subject: s3-libsmb: move protos to libsmb/proto.h Guenther --- source3/rpcclient/cmd_spoolss.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/rpcclient/cmd_spoolss.c') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 3d5f23a6e7e..42095acc54b 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -32,6 +32,7 @@ #include "../libcli/security/display_sec.h" #include "../libcli/security/security_descriptor.h" #include "../libcli/registry/util_reg.h" +#include "libsmb/libsmb.h" #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \ { \ -- cgit From c615ebed6e3d273a682806b952d543e834e5630d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 May 2011 20:21:30 +0200 Subject: s3-lib Replace StrCaseCmp() with strcasecmp_m() strcasecmp_m() never needs to call to talloc, and via next_codepoint() still has an ASCII fast-path bypassing iconv() calls. Andrew Bartlett --- source3/rpcclient/cmd_spoolss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/rpcclient/cmd_spoolss.c') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 42095acc54b..da9826ae0e4 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -83,7 +83,7 @@ static const char *cmd_spoolss_get_short_archi(const char *long_archi) do { i++; } while ( (archi_table[i].long_archi!=NULL ) && - StrCaseCmp(long_archi, archi_table[i].long_archi) ); + strcasecmp_m(long_archi, archi_table[i].long_archi) ); if (archi_table[i].long_archi==NULL) { DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi)); @@ -1616,7 +1616,7 @@ static char *get_driver_3_param(TALLOC_CTX *mem_ctx, char *str, parameter because two consecutive delimiters will not return an empty string. See man strtok(3) for details */ - if (ptr && (StrCaseCmp(ptr, "NULL") == 0)) { + if (ptr && (strcasecmp_m(ptr, "NULL") == 0)) { ptr = NULL; } -- cgit From 74eed8f3ed5c333728350df1d23a4318e9104909 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Jun 2011 15:31:03 +1000 Subject: s3-param Remove special case for global_myname(), rename to lp_netbios_name() There is no reason this can't be a normal constant string in the loadparm system, now that we have lp_set_cmdline() to handle overrides correctly. Andrew Bartlett --- source3/rpcclient/cmd_spoolss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/rpcclient/cmd_spoolss.c') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index da9826ae0e4..0e12201f927 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -3263,7 +3263,7 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli, } option.types[1].fields[0].field = JOB_NOTIFY_FIELD_PRINTER_NAME; - clientname = talloc_asprintf(mem_ctx, "\\\\%s", global_myname()); + clientname = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name()); if (!clientname) { result = WERR_NOMEM; goto done; @@ -3429,7 +3429,7 @@ 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, global_myname(), argv[2], + nt_status = cli_full_connection(&cli_server2, lp_netbios_name(), argv[2], NULL, 0, "IPC$", "IPC", get_cmdline_auth_info_username(rpcclient_auth_info), -- cgit