[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Sep 14 11:50:03 MDT 2011
The branch, master has been updated
via d727fcc libcli/auth: add some const to SMBNTencrypt_hash() and SMBNTencrypt()
via 5879358 s4:wrepl_server: return NT_STATUS_CONNECTION_DISCONNECTED
via e6a2aff s4:libcli/wrepl: return NT_STATUS_CONNECTION_DISCONNECTED
via af2e107 s4:lib/messaging: let irpc handles return NT_STATUS_CONNECTION_DISCONNECTED
via afabf12 s4:librpc/rpc: return NT_STATUS_CONNECTION_DISCONNECTED
via cd02281 s3:winbindd: let wbint handles return NT_STATUS_CONNECTION_DISCONNECTED
via 8602e8a s3:rpc_server: let rpcint handles return NT_STATUS_CONNECTION_DISCONNECTED
via cc5f973 s3:rpc_client: return NT_STATUS_CONNECTION_DISCONNECTED
via a6e8167 s3:libsmb: return NT_STATUS_CONNECTION_DISCONNECTED instead of NT_STATUS_CONNECTION_INVALID
from e80f79a s3:torture/run_oplock4: don't set cli->use_level_II_oplocks
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d727fcc867866127e84f6f997a2b8e132584616c
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 15:56:23 2011 +0200
libcli/auth: add some const to SMBNTencrypt_hash() and SMBNTencrypt()
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Sep 14 19:49:24 CEST 2011 on sn-devel-104
commit 5879358437b78d671ed2e51ee74d9ac167da9071
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s4:wrepl_server: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit e6a2affe893e28aaf3da5a16d120034669b4dc37
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s4:libcli/wrepl: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit af2e107d494a992801e639301b368c70a0f2cc70
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s4:lib/messaging: let irpc handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit afabf12251c79d741b6c7cc116b57082e168ad0a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s4:librpc/rpc: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit cd02281c2d28a51580021480739e2b9dbf9b56a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s3:winbindd: let wbint handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit 8602e8a53625b1b0da6c1ed1c6680df8a86e9f14
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:57:37 2011 +0200
s3:rpc_server: let rpcint handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
commit cc5f973884ae2c58c409ab3b59dae69bcc9a40c1
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:56:30 2011 +0200
s3:rpc_client: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places
and don't mix NT_STATUS_INVALID_CONNECTION and NT_STATUS_CONNECTION_INVALID.
metze
commit a6e8167e4a3d1e8239338bdbe9598c44a2c2ce2f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Sep 14 17:54:48 2011 +0200
s3:libsmb: return NT_STATUS_CONNECTION_DISCONNECTED instead of NT_STATUS_CONNECTION_INVALID
We should return the same in all places.
metze
-----------------------------------------------------------------------
Summary of changes:
libcli/auth/proto.h | 4 ++--
libcli/auth/smbencrypt.c | 4 ++--
source3/libsmb/async_smb.c | 2 +-
source3/rpc_client/cli_pipe.c | 4 ++--
source3/rpc_client/rpc_transport_tstream.c | 6 +++---
source3/rpc_server/rpc_ncacn_np.c | 4 ++--
source3/winbindd/winbindd_dual_ndr.c | 4 ++--
source4/lib/messaging/messaging.c | 4 ++--
source4/libcli/wrepl/winsrepl.c | 6 +++---
source4/librpc/rpc/dcerpc.c | 4 ++--
source4/wrepl_server/wrepl_out_helpers.c | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 34a0052..3d05474 100644
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -112,8 +112,8 @@ bool ntv2_owf_gen(const uint8_t owf[16],
bool upper_case_domain, /* Transform the domain into UPPER case */
uint8_t kr_buf[16]);
void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24]);
-void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24);
-void SMBNTencrypt(const char *passwd, uint8_t *c8, uint8_t *p24);
+void SMBNTencrypt_hash(const uint8_t nt_hash[16], const uint8_t *c8, uint8_t *p24);
+void SMBNTencrypt(const char *passwd, const uint8_t *c8, uint8_t *p24);
void SMBOWFencrypt_ntv2(const uint8_t kr[16],
const DATA_BLOB *srv_chal,
const DATA_BLOB *smbcli_chal,
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index 66fdbd2..37d5672 100644
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -274,7 +274,7 @@ void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24])
/* Does the des encryption. */
-void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24)
+void SMBNTencrypt_hash(const uint8_t nt_hash[16], const uint8_t *c8, uint8_t *p24)
{
uint8_t p21[21];
@@ -292,7 +292,7 @@ void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24)
/* Does the NT MD4 hash then des encryption. Plaintext version of the above. */
-void SMBNTencrypt(const char *passwd, uint8_t *c8, uint8_t *p24)
+void SMBNTencrypt(const char *passwd, const uint8_t *c8, uint8_t *p24)
{
uint8_t nt_hash[16];
E_md4hash(passwd, nt_hash);
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index df205dd..e55d5bd 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -478,7 +478,7 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
NTSTATUS status;
if (!cli_state_is_connected(state->cli)) {
- return NT_STATUS_CONNECTION_INVALID;
+ return NT_STATUS_CONNECTION_DISCONNECTED;
}
if (iov[0].iov_len < smb_wct) {
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index e352c86..ca24e03 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2033,7 +2033,7 @@ static struct tevent_req *rpccli_bh_raw_call_send(TALLOC_CTX *mem_ctx,
ok = rpccli_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -2116,7 +2116,7 @@ static struct tevent_req *rpccli_bh_disconnect_send(TALLOC_CTX *mem_ctx,
ok = rpccli_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c
index e223614..01e7a5e 100644
--- a/source3/rpc_client/rpc_transport_tstream.c
+++ b/source3/rpc_client/rpc_transport_tstream.c
@@ -186,7 +186,7 @@ static struct tevent_req *rpc_tstream_read_send(TALLOC_CTX *mem_ctx,
return NULL;
}
if (!rpc_tstream_is_connected(transp)) {
- tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
state->transp = transp;
@@ -270,7 +270,7 @@ static struct tevent_req *rpc_tstream_write_send(TALLOC_CTX *mem_ctx,
return NULL;
}
if (!rpc_tstream_is_connected(transp)) {
- tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
state->ev = ev;
@@ -366,7 +366,7 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx,
}
if (!rpc_tstream_is_connected(transp)) {
- tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
state->ev = ev;
diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index 62f4270..37c3079 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -223,7 +223,7 @@ static struct tevent_req *rpcint_bh_raw_call_send(TALLOC_CTX *mem_ctx,
ok = rpcint_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -285,7 +285,7 @@ static struct tevent_req *rpcint_bh_disconnect_send(TALLOC_CTX *mem_ctx,
ok = rpcint_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index f5f143f..f3611be 100644
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -96,7 +96,7 @@ static struct tevent_req *wbint_bh_raw_call_send(TALLOC_CTX *mem_ctx,
ok = wbint_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -201,7 +201,7 @@ static struct tevent_req *wbint_bh_disconnect_send(TALLOC_CTX *mem_ctx,
ok = wbint_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 7e017a9..11ebf19 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -1099,7 +1099,7 @@ static struct tevent_req *irpc_bh_raw_call_send(TALLOC_CTX *mem_ctx,
ok = irpc_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -1243,7 +1243,7 @@ static struct tevent_req *irpc_bh_disconnect_send(TALLOC_CTX *mem_ctx,
ok = irpc_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index c7f1ad0..eab7430 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -359,7 +359,7 @@ struct tevent_req *wrepl_request_send(TALLOC_CTX *mem_ctx,
}
if (wrepl_socket->stream == NULL) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -408,7 +408,7 @@ static void wrepl_request_trigger(struct tevent_req *req,
struct tevent_req *subreq;
if (state->caller.wrepl_socket->stream == NULL) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return;
}
@@ -450,7 +450,7 @@ static void wrepl_request_writev_done(struct tevent_req *subreq)
}
if (state->caller.wrepl_socket->stream == NULL) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return;
}
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 77b1d29..caf421b 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -221,7 +221,7 @@ static struct tevent_req *dcerpc_bh_raw_call_send(TALLOC_CTX *mem_ctx,
ok = dcerpc_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
@@ -313,7 +313,7 @@ static struct tevent_req *dcerpc_bh_disconnect_send(TALLOC_CTX *mem_ctx,
ok = dcerpc_bh_is_connected(h);
if (!ok) {
- tevent_req_nterror(req, NT_STATUS_INVALID_CONNECTION);
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
return tevent_req_post(req, ev);
}
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index cee7bfa..660e1ba 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -223,7 +223,7 @@ static NTSTATUS wreplsrv_out_connect_recv(struct composite_context *c, TALLOC_CT
*wreplconn = talloc_reference(mem_ctx, state->wreplconn);
if (!*wreplconn) status = NT_STATUS_NO_MEMORY;
} else {
- status = NT_STATUS_INVALID_CONNECTION;
+ status = NT_STATUS_CONNECTION_DISCONNECTED;
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list