[SCM] Samba Shared Repository - branch v3-6-stable updated
Karolin Seeger
kseeger at samba.org
Wed Jul 28 03:29:32 MDT 2010
The branch, v3-6-stable has been updated
via d5e4d87... s3-rpc: Use struct pipes_struct. (cherry picked from commit 6ffd7dc7805f572bcedf0693514f6aeb7be861f9) (cherry picked from commit f8cd9511b101a563d786e778369daa4877d0955f)
via 099289e4.. s3-include: Use struct pipes struct and get rid of the typedef. (cherry picked from commit f7a1453957223ead6ca2297dc57ce8c353f7fe5d) (cherry picked from commit e4b330917aa6003de007631d7406e62b281fc9fa)
via d650ef1... s3-winbind: Use struct pipes_struct. (cherry picked from commit 97dba0c0d957e17ac89e3c78eb5749621eab2a43) (cherry picked from commit bc3e7284c292907db0854b83cee12b4b3ff257a4)
via f800a37... s3-uid: Use struct pipes_struct. (cherry picked from commit 6457f814f50a00496384aad1712aba53d2609f63) (cherry picked from commit df3d8dd2864cd9f42ad2ff6605c8250367ed12b2)
via e2972a5... s3-wkssvc: Use struct pipes_struct. (cherry picked from commit d34fc3d1682c85c7d36fab168bc75bbb61b2931b) (cherry picked from commit 131db0326031eacf9cf9a773785828fd1f0dfbdc)
via 717b468... s3-winreg: Use struct pipes_struct. (cherry picked from commit 31a4240b8dd4d3f6b7f181b4d70284833589f696) (cherry picked from commit f2f2e36dcd2d1cf67e70ea7c81aac4e0879d2f2f)
via 5c35d54... s3-svcctl: Use struct pipes_struct. (cherry picked from commit ce59e69bcab308c998d8a54a68c805444d6e93ee) (cherry picked from commit 5d500282df204828519ef070d07f4393e95b7c39)
via dfe2e03... s3-srvsvc: Use struct pipes_struct. (cherry picked from commit 0fee377a52762a36a435e3fe2ffe0853cdac0bef) (cherry picked from commit 01ca496b5db2f8b4fd7082f9d1882af9fd391e4e)
via c44a241... s3-spoolss: Use struct pipes_struct. (cherry picked from commit 64fbaad942d12b343badaf8e45115a5b5ce5ea0f) (cherry picked from commit aa83c863c706dd2fea4e7ae1398d47376e0ac857)
via 07f5433... s3-samr: Use struct pipes_struct. (cherry picked from commit c3817fe9d220a3cee3d651db2808212de2b7f2cb) (cherry picked from commit 190baa7cf01099cc550a6d719f30d986e6dd5fcb)
via 5961f17... s3-rpc_pipe: Use struct pipes_struct. (cherry picked from commit 667d43d4c8916043e6474418a57aaa0d03aee078) (cherry picked from commit 47b14fcf690f01867fcfb935a798ff04ede9b791)
via 21a7ed8... s3-ntsvcs: Use struct pipes_struct. (cherry picked from commit 33d30926d1a9c2f077bdbc186c34ee01d9d2e74b) (cherry picked from commit 00578f40119167c1381c2c1f5e45c60cec2b0fad)
via 3ecb593... s3-netlogon: Use struct pipes_struct. (cherry picked from commit 3fd138fae33529fbba2da4853c10f026a6b11fb4) (cherry picked from commit 5b68707c918016c402ab2c4851a73c859c2ef5fc)
via 909d2d5... s3-lsa: Use struct pipes_struct. (cherry picked from commit 872f9655587a0bb314172797c799cd5d2a0b4e8f) (cherry picked from commit d1c7e525ca523fad41e7a8b01f2f3dbeec08ecfc)
via 44d876ea.. s3-initshutdown: Use struct pipes_struct. (cherry picked from commit 35d629d54ce30a4dbf6a53f4616ed77dd0033a1b) (cherry picked from commit 30ed816d6571906b02f380e64daa197fc0814678)
via 27c53d6... s3-eventlog: Use struct pipes_struct. (cherry picked from commit ba023aeaa95161029a0bec7dd79116a0c9db22f7) (cherry picked from commit 11d086bc79ec98d0905afb6f07c8648237d7aa3a)
via 19dba23... s3-echo: Use struct pipes_struct. (cherry picked from commit c9e37375361714dce009c5305e185e73a483a7eb) (cherry picked from commit fd9d1240864f6d8d15cd80d069960428b522bb1f)
via 1289baf... s3-dssetup: Use struct pipes_struct. (cherry picked from commit 96786a7df036d095649de300be4f37f8bcb70a6c) (cherry picked from commit ce1b9cf7b0f2da4c8104eab4dddca393b7ef832a)
via 429abf8... s3-dfs: Use struct pipes_struct. (cherry picked from commit 2956bc986f319f29bce3262ae52dd990d938146c) (cherry picked from commit 6575deed99341fe0390ba362fea9a6659cc195d5)
via 4502957... s3-rpc_server: Use struct pipes_struct. (cherry picked from commit 46397f788bf283f7eb0f26e6eeb6a2926d2769bc) (cherry picked from commit cb5bdb37a0ee693eff4491e90e60b9d1d5c127d9)
via a8f24a3... pidl: Use struct pipes_struct. (cherry picked from commit c1e81686af605bf0dafb45c316bfca3cd1a2cf9a) (cherry picked from commit 78590fa79a7ebf418adda410435cf2cb026a24f2)
via e23b761... s3-lib: Remove redefinition of RL_COMPLETION_CAST.
from 295b30f... s3/configure: Disable the automatic merged build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit d5e4d87767cfc9e8f92fd99222c1e3af3de59d75
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 11:06:36 2010 +0200
s3-rpc: Use struct pipes_struct.
(cherry picked from commit 6ffd7dc7805f572bcedf0693514f6aeb7be861f9)
(cherry picked from commit f8cd9511b101a563d786e778369daa4877d0955f)
commit 099289e4f78605affa4ef3c29d6fc10f2a14c2ba
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:28:57 2010 +0200
s3-include: Use struct pipes struct and get rid of the typedef.
(cherry picked from commit f7a1453957223ead6ca2297dc57ce8c353f7fe5d)
(cherry picked from commit e4b330917aa6003de007631d7406e62b281fc9fa)
commit d650ef1bc02c355f61cfe04cca7c8a82be030ace
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:28:36 2010 +0200
s3-winbind: Use struct pipes_struct.
(cherry picked from commit 97dba0c0d957e17ac89e3c78eb5749621eab2a43)
(cherry picked from commit bc3e7284c292907db0854b83cee12b4b3ff257a4)
commit f800a372300322de0f2491568921e36f008b751a
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:28:18 2010 +0200
s3-uid: Use struct pipes_struct.
(cherry picked from commit 6457f814f50a00496384aad1712aba53d2609f63)
(cherry picked from commit df3d8dd2864cd9f42ad2ff6605c8250367ed12b2)
commit e2972a5041e765c2e5a1578f6dec020b9eebbf08
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:27:55 2010 +0200
s3-wkssvc: Use struct pipes_struct.
(cherry picked from commit d34fc3d1682c85c7d36fab168bc75bbb61b2931b)
(cherry picked from commit 131db0326031eacf9cf9a773785828fd1f0dfbdc)
commit 717b46824b96cd8211956868b12cfd20b022198f
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:20:10 2010 +0200
s3-winreg: Use struct pipes_struct.
(cherry picked from commit 31a4240b8dd4d3f6b7f181b4d70284833589f696)
(cherry picked from commit f2f2e36dcd2d1cf67e70ea7c81aac4e0879d2f2f)
commit 5c35d549e93636ce4a60fc25374fb4814cbeb919
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:19:26 2010 +0200
s3-svcctl: Use struct pipes_struct.
(cherry picked from commit ce59e69bcab308c998d8a54a68c805444d6e93ee)
(cherry picked from commit 5d500282df204828519ef070d07f4393e95b7c39)
commit dfe2e0334ff3d267749bb0a81ed3ee48bde31188
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:19:05 2010 +0200
s3-srvsvc: Use struct pipes_struct.
(cherry picked from commit 0fee377a52762a36a435e3fe2ffe0853cdac0bef)
(cherry picked from commit 01ca496b5db2f8b4fd7082f9d1882af9fd391e4e)
commit c44a241774a5564e13653d8285ee4d389e4db117
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:18:08 2010 +0200
s3-spoolss: Use struct pipes_struct.
(cherry picked from commit 64fbaad942d12b343badaf8e45115a5b5ce5ea0f)
(cherry picked from commit aa83c863c706dd2fea4e7ae1398d47376e0ac857)
commit 07f54330dacfc41f82d8e23933dd238b526e8e6f
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:17:21 2010 +0200
s3-samr: Use struct pipes_struct.
(cherry picked from commit c3817fe9d220a3cee3d651db2808212de2b7f2cb)
(cherry picked from commit 190baa7cf01099cc550a6d719f30d986e6dd5fcb)
commit 5961f1703acf85e85ec70cc97fd324e8ddaae52e
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:16:34 2010 +0200
s3-rpc_pipe: Use struct pipes_struct.
(cherry picked from commit 667d43d4c8916043e6474418a57aaa0d03aee078)
(cherry picked from commit 47b14fcf690f01867fcfb935a798ff04ede9b791)
commit 21a7ed8afdd89852f618a765e7ea5476151e414c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 10:15:45 2010 +0200
s3-ntsvcs: Use struct pipes_struct.
(cherry picked from commit 33d30926d1a9c2f077bdbc186c34ee01d9d2e74b)
(cherry picked from commit 00578f40119167c1381c2c1f5e45c60cec2b0fad)
commit 3ecb59367e6a29b6877ed4f5104995a4834f1b6f
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:49:07 2010 +0200
s3-netlogon: Use struct pipes_struct.
(cherry picked from commit 3fd138fae33529fbba2da4853c10f026a6b11fb4)
(cherry picked from commit 5b68707c918016c402ab2c4851a73c859c2ef5fc)
commit 909d2d5cfe5a7aeec5d114def7df1690ad931b83
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:48:42 2010 +0200
s3-lsa: Use struct pipes_struct.
(cherry picked from commit 872f9655587a0bb314172797c799cd5d2a0b4e8f)
(cherry picked from commit d1c7e525ca523fad41e7a8b01f2f3dbeec08ecfc)
commit 44d876eac48ef571c29d97ffd74a60a2a4475aa2
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:48:25 2010 +0200
s3-initshutdown: Use struct pipes_struct.
(cherry picked from commit 35d629d54ce30a4dbf6a53f4616ed77dd0033a1b)
(cherry picked from commit 30ed816d6571906b02f380e64daa197fc0814678)
commit 27c53d6db349c5125dfc7192f8930237bea44891
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:48:08 2010 +0200
s3-eventlog: Use struct pipes_struct.
(cherry picked from commit ba023aeaa95161029a0bec7dd79116a0c9db22f7)
(cherry picked from commit 11d086bc79ec98d0905afb6f07c8648237d7aa3a)
commit 19dba231f4d071071629e17140302ad3b59bb660
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:47:40 2010 +0200
s3-echo: Use struct pipes_struct.
(cherry picked from commit c9e37375361714dce009c5305e185e73a483a7eb)
(cherry picked from commit fd9d1240864f6d8d15cd80d069960428b522bb1f)
commit 1289bafbe806e80b566def8ab54d47c52c52a523
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:47:25 2010 +0200
s3-dssetup: Use struct pipes_struct.
(cherry picked from commit 96786a7df036d095649de300be4f37f8bcb70a6c)
(cherry picked from commit ce1b9cf7b0f2da4c8104eab4dddca393b7ef832a)
commit 429abf8c3e81c955d1a6f6f037698f4d5637656b
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:47:04 2010 +0200
s3-dfs: Use struct pipes_struct.
(cherry picked from commit 2956bc986f319f29bce3262ae52dd990d938146c)
(cherry picked from commit 6575deed99341fe0390ba362fea9a6659cc195d5)
commit 45029573198f882e583d744352d3604a7b60dd8d
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:46:43 2010 +0200
s3-rpc_server: Use struct pipes_struct.
(cherry picked from commit 46397f788bf283f7eb0f26e6eeb6a2926d2769bc)
(cherry picked from commit cb5bdb37a0ee693eff4491e90e60b9d1d5c127d9)
commit a8f24a3023143071710b5975de6b47e476ee7074
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 28 09:23:25 2010 +0200
pidl: Use struct pipes_struct.
(cherry picked from commit c1e81686af605bf0dafb45c316bfca3cd1a2cf9a)
(cherry picked from commit 78590fa79a7ebf418adda410435cf2cb026a24f2)
commit e23b761534072c1b5565dcf91fcf7ddcfc6de699
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jun 30 13:18:21 2010 +0200
s3-lib: Remove redefinition of RL_COMPLETION_CAST.
This is already defined in replace/system/readline.h.
(cherry picked from commit dc87fbcb0f9a6ce1d722c62dafee540e75ba310e)
(cherry picked from commit cc54f68359fd74bfb3fa8bdb31faff30215c8899)
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 4 +-
source3/include/client.h | 2 +-
source3/include/ntdomain.h | 6 +-
source3/include/proto.h | 32 ++--
source3/lib/readline.c | 7 -
source3/rpc_server/rpc_handles.c | 20 +-
source3/rpc_server/rpc_ncacn_np_internal.c | 10 +-
source3/rpc_server/rpc_server.h | 4 +-
source3/rpc_server/srv_dfs_nt.c | 46 +++---
source3/rpc_server/srv_dssetup_nt.c | 22 ++--
source3/rpc_server/srv_echo_nt.c | 20 +-
source3/rpc_server/srv_eventlog_nt.c | 71 +++++---
source3/rpc_server/srv_initshutdown_nt.c | 6 +-
source3/rpc_server/srv_lsa_nt.c | 203 +++++++++++++---------
source3/rpc_server/srv_netlog_nt.c | 100 ++++++------
source3/rpc_server/srv_ntsvcs_nt.c | 130 +++++++-------
source3/rpc_server/srv_pipe.c | 49 +++---
source3/rpc_server/srv_pipe_hnd.c | 8 +-
source3/rpc_server/srv_samr_nt.c | 138 ++++++++--------
source3/rpc_server/srv_spoolss_nt.c | 250 ++++++++++++++--------------
source3/rpc_server/srv_srvsvc_nt.c | 189 ++++++++++++++--------
source3/rpc_server/srv_svcctl_nt.c | 126 +++++++++-----
source3/rpc_server/srv_winreg_nt.c | 120 +++++++++-----
source3/rpc_server/srv_wkssvc_nt.c | 91 +++++++----
source3/smbd/uid.c | 2 +-
source3/winbindd/winbindd_dual_ndr.c | 2 +-
source3/winbindd/winbindd_dual_srv.c | 51 +++---
27 files changed, 956 insertions(+), 753 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 04475d2..1f66415 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -100,7 +100,7 @@ sub CallWithStruct($$$$)
pidl "ZERO_STRUCT(r->out);" if ($hasout);
- my $proto = "_$fn->{NAME}(pipes_struct *p, struct $fn->{NAME} *r";
+ my $proto = "_$fn->{NAME}(struct pipes_struct *p, struct $fn->{NAME} *r";
my $ret = "_$fn->{NAME}($pipes_struct, r";
foreach (@{$fn->{ELEMENTS}}) {
my @dir = @{$_->{DIRECTION}};
@@ -138,7 +138,7 @@ sub ParseFunction($$)
my $op = "NDR_".uc($fn->{NAME});
- pidl "static bool api_$fn->{NAME}(pipes_struct *p)";
+ pidl "static bool api_$fn->{NAME}(struct pipes_struct *p)";
pidl "{";
indent;
pidl "const struct ndr_interface_call *call;";
diff --git a/source3/include/client.h b/source3/include/client.h
index 861ae5a..ee5afc8 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -140,7 +140,7 @@ struct rpc_pipe_client {
struct netlogon_creds_CredentialState *dc;
/* Used by internal rpc_pipe_client */
- pipes_struct *pipes_struct;
+ struct pipes_struct *pipes_struct;
};
/* Transport encryption state. */
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index ea1c0c8..5801fd3 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -127,7 +127,7 @@ struct pipe_auth_data {
* NamedPipes.
*/
-typedef struct pipes_struct {
+struct pipes_struct {
struct pipes_struct *next, *prev;
char client_address[INET6_ADDRSTRLEN];
@@ -201,12 +201,12 @@ typedef struct pipes_struct {
/* private data for the interface implementation */
void *private_data;
-} pipes_struct;
+};
struct api_struct {
const char *name;
uint8 opnum;
- bool (*fn) (pipes_struct *);
+ bool (*fn) (struct pipes_struct *);
};
#endif /* _NT_DOMAIN_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a9f7754..e591ce3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4933,14 +4933,14 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
/* The following definitions come from rpc_server/rpc_handles.c */
-size_t num_pipe_handles(pipes_struct *p);
-bool init_pipe_handles(pipes_struct *p, const struct ndr_syntax_id *syntax);
-bool create_policy_hnd(pipes_struct *p, struct policy_handle *hnd, void *data_ptr);
-bool find_policy_by_hnd(pipes_struct *p, const struct policy_handle *hnd,
+size_t num_pipe_handles(struct pipes_struct *p);
+bool init_pipe_handles(struct pipes_struct *p, const struct ndr_syntax_id *syntax);
+bool create_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd, void *data_ptr);
+bool find_policy_by_hnd(struct pipes_struct *p, const struct policy_handle *hnd,
void **data_p);
-bool close_policy_hnd(pipes_struct *p, struct policy_handle *hnd);
-void close_policy_by_pipe(pipes_struct *p);
-bool pipe_access_check(pipes_struct *p);
+bool close_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd);
+void close_policy_by_pipe(struct pipes_struct *p);
+bool pipe_access_check(struct pipes_struct *p);
void *_policy_handle_create(struct pipes_struct *p, struct policy_handle *hnd,
uint32_t access_granted, size_t data_size,
@@ -4977,23 +4977,23 @@ NTSTATUS rpc_srv_unregister(const struct ndr_interface_table *iface);
/* The following definitions come from rpc_server/srv_pipe.c */
-bool create_next_pdu(pipes_struct *p);
-bool api_pipe_bind_auth3(pipes_struct *p, struct ncacn_packet *pkt);
-bool setup_fault_pdu(pipes_struct *p, NTSTATUS status);
+bool create_next_pdu(struct pipes_struct *p);
+bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt);
+bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS status);
NTSTATUS rpc_pipe_register_commands(int version, const char *clnt,
const char *srv,
const struct ndr_syntax_id *interface,
const struct api_struct *cmds, int size);
bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
-bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt);
-bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt);
+bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt);
+bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt);
void free_pipe_rpc_context( PIPE_RPC_FNS *list );
-bool api_pipe_request(pipes_struct *p, struct ncacn_packet *pkt);
+bool api_pipe_request(struct pipes_struct *p, struct ncacn_packet *pkt);
/* The following definitions come from rpc_server/srv_pipe_hnd.c */
-pipes_struct *get_first_internal_pipe(void);
-pipes_struct *get_next_internal_pipe(pipes_struct *p);
+struct pipes_struct *get_first_internal_pipe(void);
+struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p);
bool check_open_pipes(void);
bool fsp_is_np(struct files_struct *fsp);
@@ -6174,7 +6174,7 @@ bool change_to_guest(void);
void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid);
bool change_to_user(connection_struct *conn, uint16 vuid);
bool change_to_root_user(void);
-bool become_authenticated_pipe_user(pipes_struct *p);
+bool become_authenticated_pipe_user(struct pipes_struct *p);
bool unbecome_authenticated_pipe_user(void);
void become_root(void);
void unbecome_root(void);
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 34867aa..4b82291 100644
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -38,13 +38,6 @@
# endif
#endif
-#ifdef HAVE_NEW_LIBREADLINE
-# define RL_COMPLETION_CAST (rl_completion_func_t *)
-#else
-/* This type is missing from libreadline<4.0 (approximately) */
-# define RL_COMPLETION_CAST
-#endif /* HAVE_NEW_LIBREADLINE */
-
static bool smb_rl_done;
#if HAVE_LIBREADLINE
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index e073fe4..57a3cd4 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -60,7 +60,7 @@ static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
|| ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
}
-size_t num_pipe_handles(pipes_struct *p)
+size_t num_pipe_handles(struct pipes_struct *p)
{
if (p->pipe_handles == NULL) {
return 0;
@@ -73,9 +73,9 @@ size_t num_pipe_handles(pipes_struct *p)
pipes of the same name.
****************************************************************************/
-bool init_pipe_handles(pipes_struct *p, const struct ndr_syntax_id *syntax)
+bool init_pipe_handles(struct pipes_struct *p, const struct ndr_syntax_id *syntax)
{
- pipes_struct *plist;
+ struct pipes_struct *plist;
struct handle_list *hl;
for (plist = get_first_internal_pipe();
@@ -140,7 +140,7 @@ bool init_pipe_handles(pipes_struct *p, const struct ndr_syntax_id *syntax)
data_ptr is TALLOC_FREE()'ed
****************************************************************************/
-static struct dcesrv_handle *create_rpc_handle_internal(pipes_struct *p,
+static struct dcesrv_handle *create_rpc_handle_internal(struct pipes_struct *p,
struct policy_handle *hnd, void *data_ptr)
{
struct dcesrv_handle *rpc_hnd;
@@ -197,7 +197,7 @@ static struct dcesrv_handle *create_rpc_handle_internal(pipes_struct *p,
return rpc_hnd;
}
-bool create_policy_hnd(pipes_struct *p, struct policy_handle *hnd,
+bool create_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd,
void *data_ptr)
{
struct dcesrv_handle *rpc_hnd;
@@ -213,7 +213,7 @@ bool create_policy_hnd(pipes_struct *p, struct policy_handle *hnd,
find policy by handle - internal version.
****************************************************************************/
-static struct dcesrv_handle *find_policy_by_hnd_internal(pipes_struct *p,
+static struct dcesrv_handle *find_policy_by_hnd_internal(struct pipes_struct *p,
const struct policy_handle *hnd, void **data_p)
{
struct dcesrv_handle *h;
@@ -248,7 +248,7 @@ static struct dcesrv_handle *find_policy_by_hnd_internal(pipes_struct *p,
find policy by handle
****************************************************************************/
-bool find_policy_by_hnd(pipes_struct *p, const struct policy_handle *hnd,
+bool find_policy_by_hnd(struct pipes_struct *p, const struct policy_handle *hnd,
void **data_p)
{
struct dcesrv_handle *rpc_hnd;
@@ -264,7 +264,7 @@ bool find_policy_by_hnd(pipes_struct *p, const struct policy_handle *hnd,
Close a policy.
****************************************************************************/
-bool close_policy_hnd(pipes_struct *p, struct policy_handle *hnd)
+bool close_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd)
{
struct dcesrv_handle *rpc_hnd;
@@ -289,7 +289,7 @@ bool close_policy_hnd(pipes_struct *p, struct policy_handle *hnd)
Close a pipe - free the handle set if it was the last pipe reference.
****************************************************************************/
-void close_policy_by_pipe(pipes_struct *p)
+void close_policy_by_pipe(struct pipes_struct *p)
{
p->pipe_handles->pipe_ref_count--;
@@ -313,7 +313,7 @@ will be checking a security descriptor to determine whether a user
token has enough access to access the pipe.
********************************************************************/
-bool pipe_access_check(pipes_struct *p)
+bool pipe_access_check(struct pipes_struct *p)
{
/* Don't let anonymous users access this RPC if restrict
anonymous > 0 */
diff --git a/source3/rpc_server/rpc_ncacn_np_internal.c b/source3/rpc_server/rpc_ncacn_np_internal.c
index b79b479..9bb5428 100644
--- a/source3/rpc_server/rpc_ncacn_np_internal.c
+++ b/source3/rpc_server/rpc_ncacn_np_internal.c
@@ -27,7 +27,7 @@
static int pipes_open;
-static pipes_struct *InternalPipes;
+static struct pipes_struct *InternalPipes;
/* TODO
* the following prototypes are declared here to avoid
@@ -45,12 +45,12 @@ static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
Internal Pipe iterator functions.
****************************************************************************/
-pipes_struct *get_first_internal_pipe(void)
+struct pipes_struct *get_first_internal_pipe(void)
{
return InternalPipes;
}
-pipes_struct *get_next_internal_pipe(pipes_struct *p)
+struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p)
{
return p->next;
}
@@ -71,7 +71,7 @@ static void free_pipe_rpc_context_internal( PIPE_RPC_FNS *list )
bool check_open_pipes(void)
{
- pipes_struct *p;
+ struct pipes_struct *p;
for (p = InternalPipes; p != NULL; p = p->next) {
if (num_pipe_handles(p) != 0) {
@@ -117,7 +117,7 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
const char *client_address,
struct auth_serversupplied_info *server_info)
{
- pipes_struct *p;
+ struct pipes_struct *p;
DEBUG(4,("Create pipe requested %s\n",
get_pipe_name_from_syntax(talloc_tos(), syntax)));
diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index f212773..c9e5ac0 100644
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -20,7 +20,7 @@
#ifndef _RPC_SERVER_H_
#define _RPC_SERVER_H_
-void set_incoming_fault(pipes_struct *p);
-void process_complete_pdu(pipes_struct *p);
+void set_incoming_fault(struct pipes_struct *p);
+void process_complete_pdu(struct pipes_struct *p);
#endif /* _PRC_SERVER_H_ */
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index dfa33c2..940f79d 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -30,7 +30,7 @@
/* This function does not return a WERROR or NTSTATUS code but rather 1 if
dfs exists, or 0 otherwise. */
-void _dfs_GetManagerVersion(pipes_struct *p, struct dfs_GetManagerVersion *r)
+void _dfs_GetManagerVersion(struct pipes_struct *p, struct dfs_GetManagerVersion *r)
{
if (lp_host_msdfs()) {
*r->out.version = DFS_MANAGER_VERSION_NT4;
@@ -39,7 +39,7 @@ void _dfs_GetManagerVersion(pipes_struct *p, struct dfs_GetManagerVersion *r)
}
}
-WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r)
+WERROR _dfs_Add(struct pipes_struct *p, struct dfs_Add *r)
{
struct junction_map *jn = NULL;
struct referral *old_referral_list = NULL;
@@ -105,7 +105,7 @@ WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r)
return WERR_OK;
}
-WERROR _dfs_Remove(pipes_struct *p, struct dfs_Remove *r)
+WERROR _dfs_Remove(struct pipes_struct *p, struct dfs_Remove *r)
{
struct junction_map *jn = NULL;
bool self_ref = False;
@@ -267,7 +267,7 @@ static bool init_reply_dfs_info_100(TALLOC_CTX *mem_ctx, struct junction_map* j,
return True;
}
-WERROR _dfs_Enum(pipes_struct *p, struct dfs_Enum *r)
+WERROR _dfs_Enum(struct pipes_struct *p, struct dfs_Enum *r)
{
struct junction_map *jn = NULL;
size_t num_jn = 0;
@@ -340,7 +340,7 @@ WERROR _dfs_Enum(pipes_struct *p, struct dfs_Enum *r)
return WERR_OK;
}
-WERROR _dfs_GetInfo(pipes_struct *p, struct dfs_GetInfo *r)
+WERROR _dfs_GetInfo(struct pipes_struct *p, struct dfs_GetInfo *r)
{
int consumedcnt = strlen(r->in.dfs_entry_path);
struct junction_map *jn = NULL;
@@ -404,126 +404,126 @@ WERROR _dfs_GetInfo(pipes_struct *p, struct dfs_GetInfo *r)
return WERR_OK;
}
-WERROR _dfs_SetInfo(pipes_struct *p, struct dfs_SetInfo *r)
+WERROR _dfs_SetInfo(struct pipes_struct *p, struct dfs_SetInfo *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_Rename(pipes_struct *p, struct dfs_Rename *r)
+WERROR _dfs_Rename(struct pipes_struct *p, struct dfs_Rename *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_Move(pipes_struct *p, struct dfs_Move *r)
+WERROR _dfs_Move(struct pipes_struct *p, struct dfs_Move *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_ManagerGetConfigInfo(pipes_struct *p, struct dfs_ManagerGetConfigInfo *r)
+WERROR _dfs_ManagerGetConfigInfo(struct pipes_struct *p, struct dfs_ManagerGetConfigInfo *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_ManagerSendSiteInfo(pipes_struct *p, struct dfs_ManagerSendSiteInfo *r)
+WERROR _dfs_ManagerSendSiteInfo(struct pipes_struct *p, struct dfs_ManagerSendSiteInfo *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_AddFtRoot(pipes_struct *p, struct dfs_AddFtRoot *r)
+WERROR _dfs_AddFtRoot(struct pipes_struct *p, struct dfs_AddFtRoot *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_RemoveFtRoot(pipes_struct *p, struct dfs_RemoveFtRoot *r)
+WERROR _dfs_RemoveFtRoot(struct pipes_struct *p, struct dfs_RemoveFtRoot *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_AddStdRoot(pipes_struct *p, struct dfs_AddStdRoot *r)
+WERROR _dfs_AddStdRoot(struct pipes_struct *p, struct dfs_AddStdRoot *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_RemoveStdRoot(pipes_struct *p, struct dfs_RemoveStdRoot *r)
+WERROR _dfs_RemoveStdRoot(struct pipes_struct *p, struct dfs_RemoveStdRoot *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_ManagerInitialize(pipes_struct *p, struct dfs_ManagerInitialize *r)
+WERROR _dfs_ManagerInitialize(struct pipes_struct *p, struct dfs_ManagerInitialize *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_AddStdRootForced(pipes_struct *p, struct dfs_AddStdRootForced *r)
+WERROR _dfs_AddStdRootForced(struct pipes_struct *p, struct dfs_AddStdRootForced *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_GetDcAddress(pipes_struct *p, struct dfs_GetDcAddress *r)
+WERROR _dfs_GetDcAddress(struct pipes_struct *p, struct dfs_GetDcAddress *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_SetDcAddress(pipes_struct *p, struct dfs_SetDcAddress *r)
+WERROR _dfs_SetDcAddress(struct pipes_struct *p, struct dfs_SetDcAddress *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_FlushFtTable(pipes_struct *p, struct dfs_FlushFtTable *r)
+WERROR _dfs_FlushFtTable(struct pipes_struct *p, struct dfs_FlushFtTable *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_Add2(pipes_struct *p, struct dfs_Add2 *r)
+WERROR _dfs_Add2(struct pipes_struct *p, struct dfs_Add2 *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_Remove2(pipes_struct *p, struct dfs_Remove2 *r)
+WERROR _dfs_Remove2(struct pipes_struct *p, struct dfs_Remove2 *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_EnumEx(pipes_struct *p, struct dfs_EnumEx *r)
+WERROR _dfs_EnumEx(struct pipes_struct *p, struct dfs_EnumEx *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
-WERROR _dfs_SetInfo2(pipes_struct *p, struct dfs_SetInfo2 *r)
+WERROR _dfs_SetInfo2(struct pipes_struct *p, struct dfs_SetInfo2 *r)
{
/* FIXME: Implement your code here */
p->rng_fault_state = True;
diff --git a/source3/rpc_server/srv_dssetup_nt.c b/source3/rpc_server/srv_dssetup_nt.c
index 148e182..e690969 100644
--- a/source3/rpc_server/srv_dssetup_nt.c
+++ b/source3/rpc_server/srv_dssetup_nt.c
@@ -98,7 +98,7 @@ static WERROR fill_dsrole_dominfo_basic(TALLOC_CTX *ctx,
Implement the _dssetup_DsRoleGetPrimaryDomainInformation() call
********************************************************************/
-WERROR _dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p,
+WERROR _dssetup_DsRoleGetPrimaryDomainInformation(struct pipes_struct *p,
--
Samba Shared Repository
More information about the samba-cvs
mailing list