diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-28 01:19:25 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-28 02:49:36 +0200 |
| commit | 30eeb1e3d90e93a52d81503d022218b7b6521071 (patch) | |
| tree | d06ffe424dd10e4e388414c577b804e279af0c82 | |
| parent | f888c82fe08f7bf624aad53c20aaa634662b36dd (diff) | |
| download | samba-30eeb1e3d90e93a52d81503d022218b7b6521071.tar.gz samba-30eeb1e3d90e93a52d81503d022218b7b6521071.tar.bz2 samba-30eeb1e3d90e93a52d81503d022218b7b6521071.zip | |
s3-rpc_client: move protos to init_netlogon.h
Guenther
| -rw-r--r-- | source3/include/proto.h | 31 | ||||
| -rw-r--r-- | source3/rpc_client/cli_netlogon.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/init_netlogon.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/init_netlogon.h | 5 |
4 files changed, 19 insertions, 19 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 8c3f05eade..fb88617fb1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -177,7 +177,18 @@ NTSTATUS auth_winbind_init(void); /* The following definitions come from auth/server_info.c */ struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx); - +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, + uint8_t *pipe_session_key, + size_t pipe_session_key_len, + struct netr_SamInfo3 *sam3); +NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info, + uint8_t *pipe_session_key, + size_t pipe_session_key_len, + struct netr_SamInfo6 *sam6); NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, struct samu *samu, const char *login_server, @@ -5030,24 +5041,6 @@ void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s); void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s); void init_lsa_AsciiStringLarge(struct lsa_AsciiStringLarge *name, const char *s); -/* The following definitions come from rpc_client/init_netlogon.c */ - -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, - uint8_t *pipe_session_key, - size_t pipe_session_key_len, - struct netr_SamInfo3 *sam3); -NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info, - uint8_t *pipe_session_key, - size_t pipe_session_key_len, - struct netr_SamInfo6 *sam6); -void init_netr_CryptPassword(const char *pwd, - unsigned char session_key[16], - struct netr_CryptPassword *pwd_buf); - /* The following definitions come from rpc_client/ndr.c */ struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx, diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 781fa05dc5..28972c96fa 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -24,6 +24,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_netlogon.h" #include "rpc_client/cli_netlogon.h" +#include "rpc_client/init_netlogon.h" /**************************************************************************** Wrapper function that uses the auth and auth2 calls to set up a NETLOGON diff --git a/source3/rpc_client/init_netlogon.c b/source3/rpc_client/init_netlogon.c index a1728834e7..445108a7d3 100644 --- a/source3/rpc_client/init_netlogon.c +++ b/source3/rpc_client/init_netlogon.c @@ -20,6 +20,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../lib/crypto/arcfour.h" +#include "rpc_client/init_netlogon.h" /************************************************************************* inits a netr_CryptPassword structure diff --git a/source3/rpc_client/init_netlogon.h b/source3/rpc_client/init_netlogon.h new file mode 100644 index 0000000000..d87a9ea493 --- /dev/null +++ b/source3/rpc_client/init_netlogon.h @@ -0,0 +1,5 @@ +/* The following definitions come from rpc_client/init_netlogon.c */ + +void init_netr_CryptPassword(const char *pwd, + unsigned char session_key[16], + struct netr_CryptPassword *pwd_buf); |