diff options
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/cli_unixinfo.c (renamed from source3/rpc_client/cli_unixinfo.c) | 2 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/cli_unixinfo.h (renamed from source3/rpc_client/cli_unixinfo.h) | 1 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/ndr_unixinfo.c | 78 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_unixinfo.c | 2 |
5 files changed, 3 insertions, 82 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 3eb229214b..231583469f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -296,7 +296,7 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \ rpc_client/cli_shutdown.o rpc_client/cli_svcctl.o \ rpc_client/ndr.o -LIBMSRPC_GEN_OBJ = rpc_client/cli_unixinfo.o $(LIBNDR_GEN_OBJ) $(LIBNDR_OBJ) +LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_unixinfo.o $(LIBNDR_GEN_OBJ) $(LIBNDR_OBJ) REGOBJS_OBJ = registry/reg_objects.o diff --git a/source3/rpc_client/cli_unixinfo.c b/source3/librpc/gen_ndr/cli_unixinfo.c index f2629bfde2..f84ad9175b 100644 --- a/source3/rpc_client/cli_unixinfo.c +++ b/source3/librpc/gen_ndr/cli_unixinfo.c @@ -4,7 +4,7 @@ */ #include "includes.h" -#include "./cli_unixinfo.h" +#include "librpc/gen_ndr/cli_unixinfo.h" NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct dom_sid sid, uint64_t *uid) { diff --git a/source3/rpc_client/cli_unixinfo.h b/source3/librpc/gen_ndr/cli_unixinfo.h index e854c9db9d..f0f2b54626 100644 --- a/source3/rpc_client/cli_unixinfo.h +++ b/source3/librpc/gen_ndr/cli_unixinfo.h @@ -1,4 +1,3 @@ -#include "librpc/gen_ndr/unixinfo.h" #include "librpc/gen_ndr/ndr_unixinfo.h" #ifndef __CLI_UNIXINFO__ #define __CLI_UNIXINFO__ diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c index e0ecdfe95e..8b87c67b96 100644 --- a/source3/librpc/gen_ndr/ndr_unixinfo.c +++ b/source3/librpc/gen_ndr/ndr_unixinfo.c @@ -513,81 +513,3 @@ void ndr_print_unixinfo_GetPWUid(struct ndr_print *ndr, const char *name, int fl ndr->depth--; } -const struct dcerpc_interface_call unixinfo_calls[] = { - { - "unixinfo_SidToUid", - sizeof(struct unixinfo_SidToUid), - (ndr_push_flags_fn_t) ndr_push_unixinfo_SidToUid, - (ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToUid, - (ndr_print_function_t) ndr_print_unixinfo_SidToUid, - False, - }, - { - "unixinfo_UidToSid", - sizeof(struct unixinfo_UidToSid), - (ndr_push_flags_fn_t) ndr_push_unixinfo_UidToSid, - (ndr_pull_flags_fn_t) ndr_pull_unixinfo_UidToSid, - (ndr_print_function_t) ndr_print_unixinfo_UidToSid, - False, - }, - { - "unixinfo_SidToGid", - sizeof(struct unixinfo_SidToGid), - (ndr_push_flags_fn_t) ndr_push_unixinfo_SidToGid, - (ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToGid, - (ndr_print_function_t) ndr_print_unixinfo_SidToGid, - False, - }, - { - "unixinfo_GidToSid", - sizeof(struct unixinfo_GidToSid), - (ndr_push_flags_fn_t) ndr_push_unixinfo_GidToSid, - (ndr_pull_flags_fn_t) ndr_pull_unixinfo_GidToSid, - (ndr_print_function_t) ndr_print_unixinfo_GidToSid, - False, - }, - { - "unixinfo_GetPWUid", - sizeof(struct unixinfo_GetPWUid), - (ndr_push_flags_fn_t) ndr_push_unixinfo_GetPWUid, - (ndr_pull_flags_fn_t) ndr_pull_unixinfo_GetPWUid, - (ndr_print_function_t) ndr_print_unixinfo_GetPWUid, - False, - }, - { NULL, 0, NULL, NULL, NULL, False } -}; - -const char * const unixinfo_endpoint_strings[] = { - "ncacn_np:[\\pipe\\unixinfo]", - "ncacn_ip_tcp:", - "ncalrpc:", -}; - -const struct dcerpc_endpoint_list unixinfo_endpoints = { - .count = 3, - .names = unixinfo_endpoint_strings -}; - -const char * const unixinfo_authservice_strings[] = { - "host", -}; - -const struct dcerpc_authservice_list unixinfo_authservices = { - .count = 3, - .names = unixinfo_authservice_strings -}; - - -const struct dcerpc_interface_table dcerpc_table_unixinfo = { - .name = "unixinfo", - .syntax_id = { - {0x9c54e310,0xa955,0x4885,{0xbd,0x31},{0x78,0x78,0x71,0x47,0xdf,0xa6}}, - DCERPC_UNIXINFO_VERSION - }, - .helpstring = DCERPC_UNIXINFO_HELPSTRING, - .num_calls = 5, - .calls = unixinfo_calls, - .endpoints = &unixinfo_endpoints, - .authservices = &unixinfo_authservices -}; - diff --git a/source3/rpcclient/cmd_unixinfo.c b/source3/rpcclient/cmd_unixinfo.c index 762a795bbc..4c95acc2d1 100644 --- a/source3/rpcclient/cmd_unixinfo.c +++ b/source3/rpcclient/cmd_unixinfo.c @@ -21,7 +21,7 @@ #include "includes.h" #include "rpcclient.h" -#include "rpc_client/cli_unixinfo.h" +#include "librpc/gen_ndr/cli_unixinfo.h" static NTSTATUS cmd_unixinfo_uid2sid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, |