summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-12-28 22:47:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:57 -0500
commit302cab75c33c1fb3127161a930e63df18c05159c (patch)
tree32c5d52ad5c571c391510e9f0ab06df5c88282e7
parenta50b42dcb5d50ef17007f727b6b3c60d4b7224a3 (diff)
downloadsamba-302cab75c33c1fb3127161a930e63df18c05159c.tar.gz
samba-302cab75c33c1fb3127161a930e63df18c05159c.tar.bz2
samba-302cab75c33c1fb3127161a930e63df18c05159c.zip
r12554: get rid of the pesky NTLMSSP warnings about being called after processing is finished
(This used to be commit ca6ae1afa0a8a105ab09199425f308c9ae85902f)
-rw-r--r--source4/rpc_server/dcerpc_server.c2
-rw-r--r--source4/rpc_server/dcesrv_auth.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 927d88a4ec..246f6a7274 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -644,7 +644,7 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
/*
- handle a bind request
+ handle a alter context request
*/
static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
{
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index d33b123f22..a054c5fad9 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -230,7 +230,8 @@ BOOL dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct ncacn_packet *
/* on a pure interface change there is no auth_info structure
setup */
- if (!call->conn->auth_state.auth_info) {
+ if (!call->conn->auth_state.auth_info ||
+ dce_conn->auth_state.auth_info->credentials.length == 0) {
return True;
}
@@ -258,10 +259,10 @@ BOOL dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct ncacn_packet *
dce_conn->auth_state.auth_info->auth_pad_length = 0;
dce_conn->auth_state.auth_info->auth_reserved = 0;
return True;
- } else {
- DEBUG(2, ("Failed to finish dcesrv auth alter_ack: %s\n", nt_errstr(status)));
- return True;
}
+
+ DEBUG(2, ("Failed to finish dcesrv auth alter_ack: %s\n", nt_errstr(status)));
+ return False;
}
/*