diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-14 12:16:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:01 -0500 |
| commit | b4a7b7a8889737e2891fc1176feabd4ce47f2737 (patch) | |
| tree | 6694c445bf83ead4e74cddcaf967a64491b57b4a /source3/rpc_client | |
| parent | ddf25a79f6a47fc3627f0dfdb74f47c0dffb7ff0 (diff) | |
| download | samba-b4a7b7a8889737e2891fc1176feabd4ce47f2737.tar.gz samba-b4a7b7a8889737e2891fc1176feabd4ce47f2737.tar.bz2 samba-b4a7b7a8889737e2891fc1176feabd4ce47f2737.zip | |
r22844: Introduce const DATA_BLOB data_blob_null = { NULL, 0, NULL }; and
replace all data_blob(NULL, 0) calls.
(This used to be commit 3d3d61687ef00181f4f04e001d42181d93ac931e)
Diffstat (limited to 'source3/rpc_client')
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index ab7f0b9b47..5f21caeccf 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -915,8 +915,8 @@ static NTSTATUS create_krb5_auth_bind_req( struct rpc_pipe_client *cli, #ifdef HAVE_KRB5 int ret; struct kerberos_auth_struct *a = cli->auth.a_u.kerberos_auth; - DATA_BLOB tkt = data_blob(NULL, 0); - DATA_BLOB tkt_wrapped = data_blob(NULL, 0); + DATA_BLOB tkt = data_blob_null; + DATA_BLOB tkt_wrapped = data_blob_null; /* We may change the pad length before marshalling. */ init_rpc_hdr_auth(pauth_out, RPC_KRB5_AUTH_TYPE, (int)auth_level, 0, 1); @@ -972,9 +972,9 @@ static NTSTATUS create_spnego_ntlmssp_auth_rpc_bind_req( struct rpc_pipe_client prs_struct *auth_data) { NTSTATUS nt_status; - DATA_BLOB null_blob = data_blob(NULL, 0); - DATA_BLOB request = data_blob(NULL, 0); - DATA_BLOB spnego_msg = data_blob(NULL, 0); + DATA_BLOB null_blob = data_blob_null; + DATA_BLOB request = data_blob_null; + DATA_BLOB spnego_msg = data_blob_null; /* We may change the pad length before marshalling. */ init_rpc_hdr_auth(pauth_out, RPC_SPNEGO_AUTH_TYPE, (int)auth_level, 0, 1); @@ -1019,8 +1019,8 @@ static NTSTATUS create_ntlmssp_auth_rpc_bind_req( struct rpc_pipe_client *cli, prs_struct *auth_data) { NTSTATUS nt_status; - DATA_BLOB null_blob = data_blob(NULL, 0); - DATA_BLOB request = data_blob(NULL, 0); + DATA_BLOB null_blob = data_blob_null; + DATA_BLOB request = data_blob_null; /* We may change the pad length before marshalling. */ init_rpc_hdr_auth(pauth_out, RPC_NTLMSSP_AUTH_TYPE, (int)auth_level, 0, 1); @@ -1250,7 +1250,7 @@ static NTSTATUS add_ntlmssp_auth_footer(struct rpc_pipe_client *cli, { RPC_HDR_AUTH auth_info; NTSTATUS status; - DATA_BLOB auth_blob = data_blob(NULL, 0); + DATA_BLOB auth_blob = data_blob_null; uint16 data_and_pad_len = prs_offset(outgoing_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN; if (!cli->auth.a_u.ntlmssp_state) { @@ -1775,8 +1775,8 @@ static NTSTATUS rpc_finish_auth3_bind(struct rpc_pipe_client *cli, enum pipe_auth_type auth_type, enum pipe_auth_level auth_level) { - DATA_BLOB server_response = data_blob(NULL,0); - DATA_BLOB client_reply = data_blob(NULL,0); + DATA_BLOB server_response = data_blob_null; + DATA_BLOB client_reply = data_blob_null; RPC_HDR_AUTH hdr_auth; NTSTATUS nt_status; prs_struct rpc_out; @@ -1900,10 +1900,10 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli, enum pipe_auth_type auth_type, enum pipe_auth_level auth_level) { - DATA_BLOB server_spnego_response = data_blob(NULL,0); - DATA_BLOB server_ntlm_response = data_blob(NULL,0); - DATA_BLOB client_reply = data_blob(NULL,0); - DATA_BLOB tmp_blob = data_blob(NULL, 0); + DATA_BLOB server_spnego_response = data_blob_null; + DATA_BLOB server_ntlm_response = data_blob_null; + DATA_BLOB client_reply = data_blob_null; + DATA_BLOB tmp_blob = data_blob_null; RPC_HDR_AUTH hdr_auth; NTSTATUS nt_status; prs_struct rpc_out; @@ -1953,7 +1953,7 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli, tmp_blob = spnego_gen_auth(client_reply); data_blob_free(&client_reply); client_reply = tmp_blob; - tmp_blob = data_blob(NULL,0); /* Ensure it's safe to free this just in case. */ + tmp_blob = data_blob_null; /* Ensure it's safe to free this just in case. */ /* Now prepare the alter context pdu. */ prs_init(&rpc_out, 0, prs_get_mem_context(rbuf), MARSHALL); |