diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 18:59:45 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 21:42:57 +0200 |
| commit | 8478770c357f712f1fc3b8a0a9a5f9e730388abb (patch) | |
| tree | 92f411b5b421e1526c9fd5dc4b469a9d3ea85826 | |
| parent | 5a6f3a06665ea343e2a212924cfce9edb358876f (diff) | |
| download | samba-8478770c357f712f1fc3b8a0a9a5f9e730388abb.tar.gz samba-8478770c357f712f1fc3b8a0a9a5f9e730388abb.tar.bz2 samba-8478770c357f712f1fc3b8a0a9a5f9e730388abb.zip | |
s3-rpc_client: move protos to init_samr.h
Guenther
| -rw-r--r-- | source3/include/proto.h | 9 | ||||
| -rw-r--r-- | source3/lib/netapi/user.c | 1 | ||||
| -rw-r--r-- | source3/libnet/libnet_join.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/init_samr.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/init_samr.h | 9 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_samr.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc_join.c | 1 |
8 files changed, 15 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index f3954344fc..6072f07fe9 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5036,15 +5036,6 @@ void init_netr_CryptPassword(const char *pwd, unsigned char session_key[16], struct netr_CryptPassword *pwd_buf); -/* The following definitions come from rpc_client/init_samr.c */ - -void init_samr_CryptPasswordEx(const char *pwd, - DATA_BLOB *session_key, - struct samr_CryptPasswordEx *pwd_buf); -void init_samr_CryptPassword(const char *pwd, - DATA_BLOB *session_key, - struct samr_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/lib/netapi/user.c b/source3/lib/netapi/user.c index 1ad4a6f282..249123eef6 100644 --- a/source3/lib/netapi/user.c +++ b/source3/lib/netapi/user.c @@ -24,6 +24,7 @@ #include "lib/netapi/netapi_private.h" #include "lib/netapi/libnetapi.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/init_samr.h" /**************************************************************** ****************************************************************/ diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 74ef78b921..a4aecd2112 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -22,6 +22,7 @@ #include "libnet/libnet.h" #include "libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/init_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/cli_netlogon.h" diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c index ecab28e719..e3bb3015c2 100644 --- a/source3/rpc_client/init_samr.c +++ b/source3/rpc_client/init_samr.c @@ -21,6 +21,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../lib/crypto/md5.h" #include "../lib/crypto/arcfour.h" +#include "rpc_client/init_samr.h" /************************************************************************* inits a samr_CryptPasswordEx structure diff --git a/source3/rpc_client/init_samr.h b/source3/rpc_client/init_samr.h new file mode 100644 index 0000000000..1ddaef6615 --- /dev/null +++ b/source3/rpc_client/init_samr.h @@ -0,0 +1,9 @@ +/* The following definitions come from rpc_client/init_samr.c */ + +void init_samr_CryptPasswordEx(const char *pwd, + DATA_BLOB *session_key, + struct samr_CryptPasswordEx *pwd_buf); +void init_samr_CryptPassword(const char *pwd, + DATA_BLOB *session_key, + struct samr_CryptPassword *pwd_buf); + diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 7f4b50615e..7cd2f9af88 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -27,6 +27,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" #include "rpc_client/cli_samr.h" +#include "rpc_client/init_samr.h" extern DOM_SID domain_sid; diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index ca0268483b..9a88a82219 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -25,6 +25,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" #include "rpc_client/cli_samr.h" +#include "rpc_client/init_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/cli_netlogon.h" diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index d180c2bfaa..742b71e194 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/cli_lsa.h" #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/init_samr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "rpc_client/cli_netlogon.h" |