Author: jra Date: 2005-09-09 01:17:27 +0000 (Fri, 09 Sep 2005) New Revision: 10099
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10099 Log: Make rpcclient build again. Jeremy Modified: branches/tmp/RPCREWRITE/source/rpcclient/cmd_spoolss.c branches/tmp/RPCREWRITE/source/rpcclient/cmd_test.c branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.c Changeset: Modified: branches/tmp/RPCREWRITE/source/rpcclient/cmd_spoolss.c =================================================================== --- branches/tmp/RPCREWRITE/source/rpcclient/cmd_spoolss.c 2005-09-09 01:10:40 UTC (rev 10098) +++ branches/tmp/RPCREWRITE/source/rpcclient/cmd_spoolss.c 2005-09-09 01:17:27 UTC (rev 10099) @@ -2631,8 +2631,10 @@ if ( !NT_STATUS_IS_OK(nt_status) ) return WERR_GENERAL_FAILURE; - cli2 = cli_rpc_pipe_open_noauth(cli_server2, PI_SPOOLSS); + cli2 = cli_rpc_pipe_open_noauth(cli_server2, PI_SPOOLSS, &nt_status); if (!cli2) { + printf("failed to open spoolss pipe on server %s (%s)\n", + servername2, nt_errstr(nt_status)); return WERR_GENERAL_FAILURE; } Modified: branches/tmp/RPCREWRITE/source/rpcclient/cmd_test.c =================================================================== --- branches/tmp/RPCREWRITE/source/rpcclient/cmd_test.c 2005-09-09 01:10:40 UTC (rev 10098) +++ branches/tmp/RPCREWRITE/source/rpcclient/cmd_test.c 2005-09-09 01:17:27 UTC (rev 10099) @@ -31,10 +31,10 @@ d_printf("testme\n"); - lsa_pipe = cli_rpc_pipe_open_noauth(cli->cli, PI_LSARPC); + lsa_pipe = cli_rpc_pipe_open_noauth(cli->cli, PI_LSARPC, &status); if (lsa_pipe == NULL) goto done; - samr_pipe = cli_rpc_pipe_open_noauth(cli->cli, PI_SAMR); + samr_pipe = cli_rpc_pipe_open_noauth(cli->cli, PI_SAMR, &status); if (samr_pipe == NULL) goto done; status = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, False, Modified: branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.c =================================================================== --- branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.c 2005-09-09 01:10:40 UTC (rev 10098) +++ branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.c 2005-09-09 01:17:27 UTC (rev 10099) @@ -139,8 +139,8 @@ goto error; } - if ((lsapipe = cli_rpc_pipe_open_noauth(cli, PI_LSARPC)) == NULL) { - fprintf(stderr, "could not initialise lsa pipe\n"); + if ((lsapipe = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result)) == NULL) { + fprintf(stderr, "could not initialise lsa pipe. Error was %s\n", nt_errstr(result) ); goto error; } @@ -522,7 +522,8 @@ switch (pipe_default_auth_type) { case PIPE_AUTH_TYPE_NONE: cmd_entry->rpc_pipe = cli_rpc_pipe_open_noauth(cli, - cmd_entry->pipe_idx); + cmd_entry->pipe_idx, + &ntresult); break; case PIPE_AUTH_TYPE_NTLMSSP: cmd_entry->rpc_pipe = cli_rpc_pipe_open_ntlmssp(cli, @@ -530,24 +531,27 @@ pipe_default_auth_level, lp_workgroup(), cmdline_auth_info.username, - cmdline_auth_info.password); + cmdline_auth_info.password, + &ntresult); break; case PIPE_AUTH_TYPE_SCHANNEL: cmd_entry->rpc_pipe = cli_rpc_pipe_open_schannel(cli, cmd_entry->pipe_idx, pipe_default_auth_level, - lp_workgroup()); + lp_workgroup(), + &ntresult); break; default: DEBUG(0, ("Could not initialise %s. Invalid auth type %u\n", - get_pipe_name(cmd_entry->pipe_idx), + cli_get_pipe_name(cmd_entry->pipe_idx), pipe_default_auth_type )); return NT_STATUS_UNSUCCESSFUL; } if (!cmd_entry->rpc_pipe) { - DEBUG(0, ("Could not initialise %s.\n", - get_pipe_name(cmd_entry->pipe_idx))); - return NT_STATUS_UNSUCCESSFUL; + DEBUG(0, ("Could not initialise %s. Error was %s\n", + cli_get_pipe_name(cmd_entry->pipe_idx), + nt_errstr(ntresult) )); + return ntresult; } if (cmd_entry->pipe_idx == PI_NETLOGON) { @@ -571,7 +575,7 @@ if (!NT_STATUS_IS_OK(ntresult)) { DEBUG(0, ("Could not initialise credentials for %s.\n", - get_pipe_name(cmd_entry->pipe_idx))); + cli_get_pipe_name(cmd_entry->pipe_idx))); return ntresult; } }
