The branch, master has been updated
via a8f26f6 s3-rpc_server: Normalize rpc_pipe_open_interface pipe name.
via f22e6cf s3-rpc_server: Make auth_serversupplied_info const.
via 0195f35 s3-winbind: Fixed the build of idmap_rid.
from 0061116 s4-test: fixed a typo in test_kinit.sh
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a8f26f60ec97d23f9c0496797237ead8cc3feff1
Author: Andreas Schneider <[email protected]>
Date: Thu Sep 16 10:49:39 2010 +0200
s3-rpc_server: Normalize rpc_pipe_open_interface pipe name.
Autobuild-User: Andreas Schneider <[email protected]>
Autobuild-Date: Fri Oct 15 12:15:45 UTC 2010 on sn-devel-104
commit f22e6cf3b73c04e8fada3b163567285b14840a16
Author: Andreas Schneider <[email protected]>
Date: Wed Sep 15 17:24:08 2010 +0200
s3-rpc_server: Make auth_serversupplied_info const.
commit 0195f35ce1aaa5733e006b0b703ce29b6f080b57
Author: Andreas Schneider <[email protected]>
Date: Fri Oct 15 13:32:08 2010 +0200
s3-winbind: Fixed the build of idmap_rid.
-----------------------------------------------------------------------
Summary of changes:
source3/auth/server_info.c | 2 +-
source3/include/proto.h | 6 +++---
source3/rpc_server/rpc_ncacn_np.c | 15 ++++++++++-----
source3/rpc_server/rpc_ncacn_np.h | 6 +++---
source3/winbindd/idmap_rid.c | 1 +
5 files changed, 18 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 344e8e9..c08c284 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -107,7 +107,7 @@ NTSTATUS serverinfo_to_SamInfo2(struct
auth_serversupplied_info *server_info,
already be initialized and is used as the talloc parent for its members.
*****************************************************************************/
-NTSTATUS serverinfo_to_SamInfo3(struct auth_serversupplied_info *server_info,
+NTSTATUS serverinfo_to_SamInfo3(const struct auth_serversupplied_info
*server_info,
uint8_t *pipe_session_key,
size_t pipe_session_key_len,
struct netr_SamInfo3 *sam3)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3725ea3..650d431 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -199,7 +199,7 @@ NTSTATUS serverinfo_to_SamInfo2(struct
auth_serversupplied_info *server_info,
uint8_t *pipe_session_key,
size_t pipe_session_key_len,
struct netr_SamInfo2 *sam2);
-NTSTATUS serverinfo_to_SamInfo3(struct auth_serversupplied_info *server_info,
+NTSTATUS serverinfo_to_SamInfo3(const struct auth_serversupplied_info
*server_info,
uint8_t *pipe_session_key,
size_t pipe_session_key_len,
struct netr_SamInfo3 *sam3);
@@ -4083,13 +4083,13 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
struct dcerpc_binding_handle **binding_handle);
NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *abstract_syntax,
- struct auth_serversupplied_info
*serversupplied_info,
+ const struct auth_serversupplied_info
*serversupplied_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **presult);
NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax,
- struct auth_serversupplied_info *server_info,
+ const struct auth_serversupplied_info
*server_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **cli_pipe);
diff --git a/source3/rpc_server/rpc_ncacn_np.c
b/source3/rpc_server/rpc_ncacn_np.c
index b6cf58b..f4c47fc 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -536,7 +536,7 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
*/
NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *abstract_syntax,
- struct auth_serversupplied_info
*serversupplied_info,
+ const struct auth_serversupplied_info
*serversupplied_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **presult)
@@ -587,7 +587,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX
*mem_ctx,
const char *pipe_name,
const struct tsocket_address *local_address,
const struct tsocket_address *remote_address,
- struct auth_serversupplied_info *server_info)
+ const struct auth_serversupplied_info
*server_info)
{
struct np_proxy_state *result;
char *socket_np_dir;
@@ -707,7 +707,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX
*mem_ctx,
static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx,
const char *pipe_name,
const struct ndr_syntax_id *abstract_syntax,
- struct auth_serversupplied_info *server_info,
+ const struct auth_serversupplied_info
*server_info,
struct rpc_pipe_client **_result)
{
struct tsocket_address *local, *remote;
@@ -808,7 +808,7 @@ done:
NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax,
- struct auth_serversupplied_info *server_info,
+ const struct auth_serversupplied_info
*server_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **cli_pipe)
@@ -836,11 +836,16 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
goto done;
}
- DEBUG(10, ("Connecting to %s pipe.\n", pipe_name));
+ while (pipe_name[0] == '\\') {
+ pipe_name++;
+ }
+
+ DEBUG(5, ("Connecting to %s pipe.\n", pipe_name));
server_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
"rpc_server", pipe_name,
"embedded");
+
if (StrCaseCmp(server_type, "embedded") == 0) {
status = rpc_pipe_open_internal(tmp_ctx,
syntax, server_info,
diff --git a/source3/rpc_server/rpc_ncacn_np.h
b/source3/rpc_server/rpc_ncacn_np.h
index 2487146..747e4b6 100644
--- a/source3/rpc_server/rpc_ncacn_np.h
+++ b/source3/rpc_server/rpc_ncacn_np.h
@@ -38,7 +38,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX
*mem_ctx,
const char *pipe_name,
const struct tsocket_address *local_address,
const struct tsocket_address *remote_address,
- struct auth_serversupplied_info *server_info);
+ const struct auth_serversupplied_info
*server_info);
NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *ndr_table,
struct client_address *client_id,
@@ -47,13 +47,13 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
struct dcerpc_binding_handle **binding_handle);
NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *abstract_syntax,
- struct auth_serversupplied_info
*serversupplied_info,
+ const struct auth_serversupplied_info
*serversupplied_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **presult);
NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax,
- struct auth_serversupplied_info *server_info,
+ const struct auth_serversupplied_info
*server_info,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **cli_pipe);
diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c
index 982c4fd..ae54475 100644
--- a/source3/winbindd/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "winbindd.h"
#include "idmap.h"
+#include "../libcli/security/dom_sid.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
--
Samba Shared Repository
