Author: jerry Date: 2005-08-01 20:54:31 +0000 (Mon, 01 Aug 2005) New Revision: 8899
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8899 Log: various compiler warning fixes reported by Jason Mader <[EMAIL PROTECTED]> Modified: branches/SAMBA_3_0/source/lib/substitute.c branches/SAMBA_3_0/source/libads/ldap_printer.c branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c trunk/source/lib/substitute.c trunk/source/libads/ldap_printer.c trunk/source/rpc_parse/parse_svcctl.c trunk/source/rpcclient/cmd_spoolss.c trunk/source/rpcclient/rpcclient.c Changeset: Modified: branches/SAMBA_3_0/source/lib/substitute.c =================================================================== --- branches/SAMBA_3_0/source/lib/substitute.c 2005-08-01 20:51:13 UTC (rev 8898) +++ branches/SAMBA_3_0/source/lib/substitute.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -386,7 +386,7 @@ string_sub(p,"%i", client_socket_addr(),l); break; case 'L' : - if (!StrnCaseCmp(p, "\%LOGONSERVER\%", 13)) { + if (!StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%"))) { p++; break; } Modified: branches/SAMBA_3_0/source/libads/ldap_printer.c =================================================================== --- branches/SAMBA_3_0/source/libads/ldap_printer.c 2005-08-01 20:51:13 UTC (rev 8898) +++ branches/SAMBA_3_0/source/libads/ldap_printer.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -286,7 +286,7 @@ 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 @@ 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", Modified: branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c =================================================================== --- branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c 2005-08-01 20:51:13 UTC (rev 8898) +++ branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -714,7 +714,7 @@ 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); Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c =================================================================== --- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-01 20:51:13 UTC (rev 8898) +++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -2201,7 +2201,7 @@ 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 @@ /* 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; Modified: trunk/source/lib/substitute.c =================================================================== --- trunk/source/lib/substitute.c 2005-08-01 20:51:13 UTC (rev 8898) +++ trunk/source/lib/substitute.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -386,7 +386,7 @@ string_sub(p,"%i", client_socket_addr(),l); break; case 'L' : - if (!StrnCaseCmp(p, "\%LOGONSERVER\%", 13)) { + if (!StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%"))) { p++; break; } Modified: trunk/source/libads/ldap_printer.c =================================================================== --- trunk/source/libads/ldap_printer.c 2005-08-01 20:51:13 UTC (rev 8898) +++ trunk/source/libads/ldap_printer.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -286,7 +286,7 @@ 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 @@ 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", Modified: trunk/source/rpc_parse/parse_svcctl.c =================================================================== --- trunk/source/rpc_parse/parse_svcctl.c 2005-08-01 20:51:13 UTC (rev 8898) +++ trunk/source/rpc_parse/parse_svcctl.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -714,7 +714,7 @@ 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); Modified: trunk/source/rpcclient/cmd_spoolss.c =================================================================== --- trunk/source/rpcclient/cmd_spoolss.c 2005-08-01 20:51:13 UTC (rev 8898) +++ trunk/source/rpcclient/cmd_spoolss.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -2201,7 +2201,7 @@ 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 @@ /* 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; Modified: trunk/source/rpcclient/rpcclient.c =================================================================== --- trunk/source/rpcclient/rpcclient.c 2005-08-01 20:51:13 UTC (rev 8898) +++ trunk/source/rpcclient/rpcclient.c 2005-08-01 20:54:31 UTC (rev 8899) @@ -741,7 +741,9 @@ return 1; } +#if 0 /* COMMENT OUT FOR TESTING */ memset(cmdline_auth_info.password,'X',sizeof(cmdline_auth_info.password)); +#endif /* Load command lists */
