r8899: various compiler warning fixes reported by Jason Mader <jason@ncac.gwu.edu>

(This used to be commit d8ae9f2b3e5387ef2c4e84cd9c33f4a7c795b0d3)

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 15862f7a9666a1753f8e9d32adc1a1994ea8cb0c..c6d61bce951fbe6a82036c908496789659ff3bfe 100644 (file)
--- 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 9773296ae08dfc08f54f317d462c6aa15bbccc3d..f4ecbdd93ced682f5542177148764a5daca07fa2 100644 (file)
--- 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 85889d58890cfcfbaa0d28c7ffcfabc484d24a01..77b48fd0ee1775ba3b7e0933f3e268fe51e73fcd 100644 (file)
--- 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 f774d408fe6628e6cb8d4c8ddfa75468f9816dca..abf5bad6d512eb47be8e1568a8eb308d837f9534 100644 (file)
--- 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;