Fix all warnings in source3 with gcc4.3.

[ira/wip.git] / source3 / rpcclient / cmd_spoolss.c

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 2a9f2b82bb2c0bf1ba8c7dd2bfa86296736f66c3..ecd0f36217af6ecfb307f1183359c9dc24cfc47d 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -691,7 +691,7 @@ static void display_reg_value(REGISTRY_VALUE value)
                printf("%s: REG_SZ: %s\n", value.valuename, text ? text : "");
                break;
        case REG_BINARY: {
-               char *hex = hex_encode(NULL, value.data_p, value.size);
+               char *hex = hex_encode_talloc(NULL, value.data_p, value.size);
                size_t i, len;
                printf("%s: REG_BINARY:", value.valuename);
                len = strlen(hex);
@@ -1539,7 +1539,7 @@ static WERROR cmd_spoolss_deletedriverex(struct rpc_pipe_client *cli,
                {
                        if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) {
                                printf ("Failed to remove driver %s for arch [%s] (version: %d): %s\n", 
-                                       argv[1], archi_table[i].long_archi, archi_table[i].version, dos_errstr(result));
+                                       argv[1], archi_table[i].long_archi, archi_table[i].version, win_errstr(result));
                        }
                } 
                else 
@@ -1655,9 +1655,14 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
+       if (asprintf(&servername, "\\\\%s", cli->desthost) == -1) {
+               return WERR_NOMEM;
+       }
        strupper_m(servername);
-       asprintf(&printername, "%s\\%s", servername, argv[1]);
+       if (asprintf(&printername, "%s\\%s", servername, argv[1]) == -1) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
 
        werror = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
                                             PRINTER_ALL_ACCESS, 
@@ -1716,9 +1721,14 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
+       if (asprintf(&servername, "\\\\%s", cli->desthost)) {
+               return WERR_NOMEM;
+       }
        strupper_m(servername);
-       asprintf(&printername, "%s\\%s", servername, argv[1]);
+       if (asprintf(&printername, "%s\\%s", servername, argv[1]) == -1) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
 
        werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
@@ -1813,9 +1823,14 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
+       if (asprintf(&servername, "\\\\%s", cli->desthost) == -1) {
+               return WERR_NOMEM;
+       }
        strupper_m(servername);
-       asprintf(&printername, "%s\\%s", servername, argv[1]);
+       if (asprintf(&printername, "%s\\%s", servername, argv[1])) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
 
        werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
@@ -1866,9 +1881,14 @@ static WERROR cmd_spoolss_deleteform(struct rpc_pipe_client *cli,
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
+       if (asprintf(&servername, "\\\\%s", cli->desthost) == -1) {
+               return WERR_NOMEM;
+       }
        strupper_m(servername);
-       asprintf(&printername, "%s\\%s", servername, argv[1]);
+       if (asprintf(&printername, "%s\\%s", servername, argv[1]) == -1) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
 
        werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
@@ -1916,9 +1936,14 @@ static WERROR cmd_spoolss_enum_forms(struct rpc_pipe_client *cli,
        
        /* Get a printer handle */
 
-       asprintf(&servername, "\\\\%s", cli->desthost);
+       if (asprintf(&servername, "\\\\%s", cli->desthost) == -1) {
+               return WERR_NOMEM;
+       }
        strupper_m(servername);
-       asprintf(&printername, "%s\\%s", servername, argv[1]);
+       if (asprintf(&printername, "%s\\%s", servername, argv[1]) == -1) {
+               SAFE_FREE(servername);
+               return WERR_NOMEM;
+       }
 
        werror = rpccli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
@@ -2555,7 +2580,7 @@ static bool compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1,
        printf("Retrieving printer propertiesfor %s...", cli1->desthost);
        werror = rpccli_spoolss_getprinter( cli1, mem_ctx, hnd1, 2, &ctr1);
        if ( !W_ERROR_IS_OK(werror) ) {
-               printf("failed (%s)\n", dos_errstr(werror));
+               printf("failed (%s)\n", win_errstr(werror));
                talloc_destroy(mem_ctx);
                return False;
        }
@@ -2564,7 +2589,7 @@ static bool compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1,
        printf("Retrieving printer properties for %s...", cli2->desthost);
        werror = rpccli_spoolss_getprinter( cli2, mem_ctx, hnd2, 2, &ctr2);
        if ( !W_ERROR_IS_OK(werror) ) {
-               printf("failed (%s)\n", dos_errstr(werror));
+               printf("failed (%s)\n", win_errstr(werror));
                talloc_destroy(mem_ctx);
                return False;
        }
@@ -2591,7 +2616,7 @@ static bool compare_printer_secdesc( struct rpc_pipe_client *cli1, POLICY_HND *h
        printf("Retrieving printer security for %s...", cli1->desthost);
        werror = rpccli_spoolss_getprinter( cli1, mem_ctx, hnd1, 3, &ctr1);
        if ( !W_ERROR_IS_OK(werror) ) {
-               printf("failed (%s)\n", dos_errstr(werror));
+               printf("failed (%s)\n", win_errstr(werror));
                result = False;
                goto done;
        }
@@ -2600,7 +2625,7 @@ static bool compare_printer_secdesc( struct rpc_pipe_client *cli1, POLICY_HND *h
        printf("Retrieving printer security for %s...", cli2->desthost);
        werror = rpccli_spoolss_getprinter( cli2, mem_ctx, hnd2, 3, &ctr2);
        if ( !W_ERROR_IS_OK(werror) ) {
-               printf("failed (%s)\n", dos_errstr(werror));
+               printf("failed (%s)\n", win_errstr(werror));
                result = False;
                goto done;
        }
@@ -2641,6 +2666,8 @@ 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)
@@ -2671,11 +2698,11 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
        nt_status = cli_full_connection(&cli_server2, global_myname(), servername2, 
                                        NULL, 0,
                                        "IPC$", "IPC",
-                                       get_cmdline_auth_info_username(),
+                                       get_cmdline_auth_info_username(rpcclient_auth_info),
                                        lp_workgroup(),
-                                       get_cmdline_auth_info_password(),
-                                       get_cmdline_auth_info_use_kerberos() ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
-                                       get_cmdline_auth_info_signing_state(), NULL);
+                                       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);
 
        if ( !NT_STATUS_IS_OK(nt_status) )
                return WERR_GENERAL_FAILURE;
@@ -2701,7 +2728,7 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
        werror = rpccli_spoolss_open_printer_ex( cli, mem_ctx, printername_path, 
                "", PRINTER_ALL_ACCESS, servername1, cli_server1->user_name, &hPrinter1);
        if ( !W_ERROR_IS_OK(werror) ) {
-               printf("failed (%s)\n", dos_errstr(werror));
+               printf("failed (%s)\n", win_errstr(werror));
                goto done;
        }
        printf("ok\n");
@@ -2717,7 +2744,7 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
        werror = rpccli_spoolss_open_printer_ex( cli2, mem_ctx, printername_path,  
                "", PRINTER_ALL_ACCESS, servername2, cli_server2->user_name, &hPrinter2 );
        if ( !W_ERROR_IS_OK(werror) ) {
-                printf("failed (%s)\n", dos_errstr(werror));
+                printf("failed (%s)\n", win_errstr(werror));
                goto done;
        }
        printf("ok\n");