[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed Mar 2 15:07:02 MST 2011
The branch, master has been updated
via ba77274 s3-includes: remove global include of system/readline.h.
via a460fe8 s3-proto: fix some inline comments.
via 93db948 s3-libds: use already existing ../libds/common/flag_mapping.h header.
from 4afda9e s3: Pass the aio_force operation through vfs_gpfs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ba7727487e50005555d0c414c23cdd2edb610524
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:18:33 2011 +0100
s3-includes: remove global include of system/readline.h.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Mar 2 23:06:17 CET 2011 on sn-devel-104
commit a460fe8151d6afb29dde623971cde95ef41f6bd8
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 26 00:28:38 2011 +0100
s3-proto: fix some inline comments.
Guenther
commit 93db9489fd778bd96e6434f4bd70e90b47c01b06
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 26 00:17:33 2011 +0100
s3-libds: use already existing ../libds/common/flag_mapping.h header.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/includes.h | 1 -
source3/include/proto.h | 24 ++++++++++++------------
source3/lib/netapi/user.c | 1 +
source3/libnet/libnet_dssync_passdb.c | 1 +
source3/passdb/pdb_ads.c | 1 +
source3/winbindd/winbindd_ads.c | 1 +
6 files changed, 16 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7914584..9d55c4a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -76,7 +76,6 @@
#include "system/locale.h"
#include "system/network.h"
#include "system/passwd.h"
-#include "system/readline.h"
#include "system/select.h"
#include "system/shmem.h"
#include "system/syslog.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bfbf840..e866ded 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3955,13 +3955,16 @@ bool lookup_wellknown_name(TALLOC_CTX *mem_ctx, const char *name,
void set_profile_level(int level, struct server_id src);
bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
-/* The following definitions come from rpc_client/cli_pipe.c */
+/* The following definitions come from librpc/rpc/rpc_common.c */
+
bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
const struct ndr_interface_table *get_iface_from_syntax(
const struct ndr_syntax_id *syntax);
const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax);
+/* The following definitions come from rpc_server/rpc_ncacn_np.c */
+
struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax,
struct client_address *client_id,
@@ -3985,6 +3988,9 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **cli_pipe);
+
+/* The following definitions come from rpc_client/cli_pipe_schannel.c */
+
NTSTATUS get_schannel_session_key(struct cli_state *cli,
const char *domain,
uint32 *pneg_flags,
@@ -4002,7 +4008,6 @@ NTSTATUS rpc_transport_np_init_recv(struct tevent_req *req,
NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_cli_transport **presult);
-struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
/* The following definitions come from rpc_client/rpc_transport_sock.c */
@@ -4010,9 +4015,11 @@ NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
struct rpc_cli_transport **presult);
/* The following definitions come from rpc_client/rpc_transport_tstream.c */
+
NTSTATUS rpc_transport_tstream_init(TALLOC_CTX *mem_ctx,
struct tstream_context **stream,
struct rpc_cli_transport **presult);
+struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
/* The following definitions come from rpc_server/srv_eventlog_nt.c */
@@ -5369,7 +5376,7 @@ void *avahi_start_register(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
void msg_idmap_register_msgs(struct messaging_context *ctx);
-/* Misc protos */
+/* The following definitions come from lib/fncall.c */
struct fncall_context *fncall_context_init(TALLOC_CTX *mem_ctx,
int max_threads);
@@ -5379,6 +5386,8 @@ struct tevent_req *fncall_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
void *private_data);
int fncall_recv(struct tevent_req *req, int *perr);
+/* The following definitions come from libsmb/smbsock_connect.c */
+
struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
const struct sockaddr_storage *addr,
@@ -5424,13 +5433,4 @@ void map_max_allowed_access(const struct security_token *nt_token,
const struct security_unix_token *unix_token,
uint32_t *pacc_requested);
-/* The following definitions come from ../libds/common/flag_mapping.c */
-
-uint32_t ds_acb2uf(uint32_t acb);
-uint32_t ds_uf2acb(uint32_t uf);
-uint32_t ds_uf2atype(uint32_t uf);
-uint32_t ds_gtype2atype(uint32_t gtype);
-enum lsa_SidType ds_atype_map(uint32_t atype);
-uint32_t ds_uf2prim_group_rid(uint32_t uf);
-
#endif /* _PROTO_H_ */
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 3f8d6f5..51a0934 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -28,6 +28,7 @@
#include "../libds/common/flags.h"
#include "rpc_client/init_lsa.h"
#include "../libcli/security/security.h"
+#include "../libds/common/flag_mapping.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index df99e40..d38146e 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -24,6 +24,7 @@
#include "../libds/common/flags.h"
#include "../librpc/gen_ndr/ndr_drsuapi.h"
#include "dbwrap.h"
+#include "../libds/common/flag_mapping.h"
/****************************************************************
****************************************************************/
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 4d47a3f..ba2193b 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -25,6 +25,7 @@
#include "../librpc/gen_ndr/samr.h"
#include "../libcli/ldap/ldap_ndr.h"
#include "../libcli/security/security.h"
+#include "../libds/common/flag_mapping.h"
struct pdb_ads_state {
struct sockaddr_un socket_address;
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index a392305..838e74b 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -29,6 +29,7 @@
#include "secrets.h"
#include "../libcli/ldap/ldap_ndr.h"
#include "../libcli/security/security.h"
+#include "../libds/common/flag_mapping.h"
#ifdef HAVE_ADS
--
Samba Shared Repository
More information about the samba-cvs
mailing list