summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-08-01 20:54:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:19 -0500
commit14a9d52832b19a698968900da6378d542d6a21ce (patch)
tree3c74f3434ba64313cc611d8f6168f544c9a92702
parent473cfa4c35170ec51a9ae92986ff2891e5068d4b (diff)
downloadsamba-14a9d52832b19a698968900da6378d542d6a21ce.tar.gz
samba-14a9d52832b19a698968900da6378d542d6a21ce.tar.bz2
samba-14a9d52832b19a698968900da6378d542d6a21ce.zip
r8899: various compiler warning fixes reported by Jason Mader <jason@ncac.gwu.edu>
(This used to be commit d8ae9f2b3e5387ef2c4e84cd9c33f4a7c795b0d3)
-rw-r--r--source3/lib/substitute.c2
-rw-r--r--source3/libads/ldap_printer.c4
-rw-r--r--source3/rpc_parse/parse_svcctl.c2
-rw-r--r--source3/rpcclient/cmd_spoolss.c5
4 files changed, 6 insertions, 7 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 15862f7a96..c6d61bce95 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -386,7 +386,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
string_sub(p,"%i", client_socket_addr(),l);
break;
case 'L' :
- if (!StrnCaseCmp(p, "\%LOGONSERVER\%", 13)) {
+ if (!StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%"))) {
p++;
break;
}
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 9773296ae0..f4ecbdd93c 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -286,7 +286,7 @@ WERROR get_remote_printer_publishing_data(struct cli_state *cli,
return result;
}
- result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSDRIVER_KEY, NULL);
+ result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSDRIVER_KEY, &dsdriver_ctr);
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n",
@@ -300,7 +300,7 @@ WERROR get_remote_printer_publishing_data(struct cli_state *cli,
dsdriver_ctr.values[i]);
}
- result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSSPOOLER_KEY, NULL);
+ result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSSPOOLER_KEY, &dsspooler_ctr);
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n",
diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index 85889d5889..77b48fd0ee 100644
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -714,7 +714,7 @@ BOOL svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_
void init_service_description_buffer(RPC_DATA_BLOB *str, const char *service_desc, int blob_length)
{
uint32 offset;
- char *bp;
+ uint8 *bp;
ZERO_STRUCTP(str);
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index f774d408fe..abf5bad6d5 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2201,7 +2201,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli,
uint32 i;
BOOL got_hnd = False;
pstring printername;
- fstring servername, user;
+ fstring servername, user
const char *keyname = NULL;
POLICY_HND hnd;
REGVAL_CTR ctr;
@@ -2233,8 +2233,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli,
/* Enumerate subkeys */
- result = cli_spoolss_enumprinterdataex(
- cli, mem_ctx, &hnd, keyname, NULL);
+ result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &hnd, keyname, &ctr);
if (!W_ERROR_IS_OK(result))
goto done;