remove unused unixinfo.idl and generated files

The idl in this version uses pidl specific non NDR types...

metze
(This used to be commit 5dd83aaff325a1d15a0c786cbab42b8fcd6dd5ee)

9 files changed, 2 insertions, 1393 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1b91b7e326..599e7a9e1f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -940,7 +940,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
 	    $(RPC_LSA_OBJ) $(RPC_NETLOG_OBJ) $(RPC_SAMR_OBJ) $(RPC_REG_OBJ) $(RPC_DSSETUP_OBJ) \
 	    $(RPC_SVC_OBJ) $(RPC_WKS_OBJ) $(RPC_DFS_OBJ) $(RPC_SPOOLSS_OBJ) \
 	    $(RPC_ECHO_OBJ) $(RPC_SVCCTL_OBJ) $(RPC_EVENTLOG_OBJ) $(SMBLDAP_OBJ) \
-            $(IDMAP_OBJ) libsmb/spnego.o $(PASSCHANGE_OBJ) $(RPC_UNIXINFO_OBJ) \
+            $(IDMAP_OBJ) libsmb/spnego.o $(PASSCHANGE_OBJ) \
 	    $(RPC_NTSVCS_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
 	    utils/passwd_util.o $(LIBGPO_OBJ) $(NSS_INFO_OBJ) \
 	    $(RPCCLIENT_NDR_OBJ) $(DISPLAY_DSDCINFO_OBJ) \
@@ -1134,7 +1134,7 @@ modules: SHOWFLAGS $(MODULES)
 
 #####################################################################
 ## Perl IDL Compiler
-IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
+IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
 	srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \
 	epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
 	dssetup.idl krb5pac.idl ntsvcs.idl libnet_join.idl
@@ -1583,10 +1583,6 @@ bin/librpc_samr.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SAMR_OBJ)
 	@echo "Linking $@"
 	@$(SHLD_MODULE) $(RPC_SAMR_OBJ)
 
-bin/librpc_unixinfo.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_UNIXINFO_OBJ)
-	@echo "Linking $@"
-	@$(SHLD_MODULE) $(RPC_UNIXINFO_OBJ)
-
 bin/librpc_srvsvc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVC_OBJ)
 	@echo "Linking $@"
 	@$(SHLD_MODULE) $(RPC_SVC_OBJ)
diff --git a/source3/librpc/gen_ndr/cli_unixinfo.c b/source3/librpc/gen_ndr/cli_unixinfo.c
deleted file mode 100644
index c8a6c926ef..0000000000
--- a/source3/librpc/gen_ndr/cli_unixinfo.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * client auto-generated by pidl. DO NOT MODIFY!
- */
-
-#include "includes.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)
-{
-	struct unixinfo_SidToUid r;
-	NTSTATUS status;
-
-	/* In parameters */
-	r.in.sid = sid;
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_SidToUid, &r);
-	}
-
-	status = cli_do_rpc_ndr(cli,
-				mem_ctx,
-				PI_UNIXINFO,
-				&ndr_table_unixinfo,
-				NDR_UNIXINFO_SIDTOUID,
-				&r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_SidToUid, &r);
-	}
-
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	/* Return variables */
-	*uid = *r.out.uid;
-
-	/* Return result */
-	return r.out.result;
-}
-
-NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint64_t uid,
-				  struct dom_sid *sid)
-{
-	struct unixinfo_UidToSid r;
-	NTSTATUS status;
-
-	/* In parameters */
-	r.in.uid = uid;
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_UidToSid, &r);
-	}
-
-	status = cli_do_rpc_ndr(cli,
-				mem_ctx,
-				PI_UNIXINFO,
-				&ndr_table_unixinfo,
-				NDR_UNIXINFO_UIDTOSID,
-				&r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_UidToSid, &r);
-	}
-
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	/* Return variables */
-	*sid = *r.out.sid;
-
-	/* Return result */
-	return r.out.result;
-}
-
-NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  struct dom_sid sid,
-				  uint64_t *gid)
-{
-	struct unixinfo_SidToGid r;
-	NTSTATUS status;
-
-	/* In parameters */
-	r.in.sid = sid;
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_SidToGid, &r);
-	}
-
-	status = cli_do_rpc_ndr(cli,
-				mem_ctx,
-				PI_UNIXINFO,
-				&ndr_table_unixinfo,
-				NDR_UNIXINFO_SIDTOGID,
-				&r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_SidToGid, &r);
-	}
-
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	/* Return variables */
-	*gid = *r.out.gid;
-
-	/* Return result */
-	return r.out.result;
-}
-
-NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint64_t gid,
-				  struct dom_sid *sid)
-{
-	struct unixinfo_GidToSid r;
-	NTSTATUS status;
-
-	/* In parameters */
-	r.in.gid = gid;
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_GidToSid, &r);
-	}
-
-	status = cli_do_rpc_ndr(cli,
-				mem_ctx,
-				PI_UNIXINFO,
-				&ndr_table_unixinfo,
-				NDR_UNIXINFO_GIDTOSID,
-				&r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_GidToSid, &r);
-	}
-
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	/* Return variables */
-	*sid = *r.out.sid;
-
-	/* Return result */
-	return r.out.result;
-}
-
-NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint32_t *count,
-				  uint64_t *uids,
-				  struct unixinfo_GetPWUidInfo *infos)
-{
-	struct unixinfo_GetPWUid r;
-	NTSTATUS status;
-
-	/* In parameters */
-	r.in.count = count;
-	r.in.uids = uids;
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_GetPWUid, &r);
-	}
-
-	status = cli_do_rpc_ndr(cli,
-				mem_ctx,
-				PI_UNIXINFO,
-				&ndr_table_unixinfo,
-				NDR_UNIXINFO_GETPWUID,
-				&r);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_GetPWUid, &r);
-	}
-
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	/* Return variables */
-	*count = *r.out.count;
-	memcpy(infos, r.out.infos, *r.in.count);
-
-	/* Return result */
-	return r.out.result;
-}
-
diff --git a/source3/librpc/gen_ndr/cli_unixinfo.h b/source3/librpc/gen_ndr/cli_unixinfo.h
deleted file mode 100644
index fa084cc75d..0000000000
--- a/source3/librpc/gen_ndr/cli_unixinfo.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "librpc/gen_ndr/ndr_unixinfo.h"
-#ifndef __CLI_UNIXINFO__
-#define __CLI_UNIXINFO__
-NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  struct dom_sid sid,
-				  uint64_t *uid);
-NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint64_t uid,
-				  struct dom_sid *sid);
-NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  struct dom_sid sid,
-				  uint64_t *gid);
-NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint64_t gid,
-				  struct dom_sid *sid);
-NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  uint32_t *count,
-				  uint64_t *uids,
-				  struct unixinfo_GetPWUidInfo *infos);
-#endif /* __CLI_UNIXINFO__ */
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c
deleted file mode 100644
index b0b5c81395..0000000000
--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/* parser auto-generated by pidl */
-
-#include "includes.h"
-#include "librpc/gen_ndr/ndr_unixinfo.h"
-
-#include "librpc/gen_ndr/ndr_security.h"
-static enum ndr_err_code ndr_push_unixinfo_GetPWUidInfo(struct ndr_push *ndr, int ndr_flags, const struct unixinfo_GetPWUidInfo *r)
-{
-	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_push_align(ndr, 4));
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->status));
-		{
-			uint32_t _flags_save_string = ndr->flags;
-			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
-			NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->homedir));
-			ndr->flags = _flags_save_string;
-		}
-		{
-			uint32_t _flags_save_string = ndr->flags;
-			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
-			NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->shell));
-			ndr->flags = _flags_save_string;
-		}
-	}
-	if (ndr_flags & NDR_BUFFERS) {
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_GetPWUidInfo(struct ndr_pull *ndr, int ndr_flags, struct unixinfo_GetPWUidInfo *r)
-{
-	if (ndr_flags & NDR_SCALARS) {
-		NDR_CHECK(ndr_pull_align(ndr, 4));
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->status));
-		{
-			uint32_t _flags_save_string = ndr->flags;
-			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
-			NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->homedir));
-			ndr->flags = _flags_save_string;
-		}
-		{
-			uint32_t _flags_save_string = ndr->flags;
-			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
-			NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->shell));
-			ndr->flags = _flags_save_string;
-		}
-	}
-	if (ndr_flags & NDR_BUFFERS) {
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_GetPWUidInfo(struct ndr_print *ndr, const char *name, const struct unixinfo_GetPWUidInfo *r)
-{
-	ndr_print_struct(ndr, name, "unixinfo_GetPWUidInfo");
-	ndr->depth++;
-	ndr_print_NTSTATUS(ndr, "status", r->status);
-	ndr_print_string(ndr, "homedir", r->homedir);
-	ndr_print_string(ndr, "shell", r->shell);
-	ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_unixinfo_SidToUid(struct ndr_push *ndr, int flags, const struct unixinfo_SidToUid *r)
-{
-	if (flags & NDR_IN) {
-		NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sid));
-	}
-	if (flags & NDR_OUT) {
-		if (r->out.uid == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, *r->out.uid));
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_SidToUid(struct ndr_pull *ndr, int flags, struct unixinfo_SidToUid *r)
-{
-	TALLOC_CTX *_mem_save_uid_0;
-	if (flags & NDR_IN) {
-		ZERO_STRUCT(r->out);
-
-		NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sid));
-		NDR_PULL_ALLOC(ndr, r->out.uid);
-		ZERO_STRUCTP(r->out.uid);
-	}
-	if (flags & NDR_OUT) {
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->out.uid);
-		}
-		_mem_save_uid_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.uid, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, r->out.uid));
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_uid_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_SidToUid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_SidToUid *r)
-{
-	ndr_print_struct(ndr, name, "unixinfo_SidToUid");
-	ndr->depth++;
-	if (flags & NDR_SET_VALUES) {
-		ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-	}
-	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "unixinfo_SidToUid");
-		ndr->depth++;
-		ndr_print_dom_sid(ndr, "sid", &r->in.sid);
-		ndr->depth--;
-	}
-	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "unixinfo_SidToUid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "uid", r->out.uid);
-		ndr->depth++;
-		ndr_print_hyper(ndr, "uid", *r->out.uid);
-		ndr->depth--;
-		ndr_print_NTSTATUS(ndr, "result", r->out.result);
-		ndr->depth--;
-	}
-	ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_unixinfo_UidToSid(struct ndr_push *ndr, int flags, const struct unixinfo_UidToSid *r)
-{
-	if (flags & NDR_IN) {
-		NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->in.uid));
-	}
-	if (flags & NDR_OUT) {
-		if (r->out.sid == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sid));
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_UidToSid(struct ndr_pull *ndr, int flags, struct unixinfo_UidToSid *r)
-{
-	TALLOC_CTX *_mem_save_sid_0;
-	if (flags & NDR_IN) {
-		ZERO_STRUCT(r->out);
-
-		NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->in.uid));
-		NDR_PULL_ALLOC(ndr, r->out.sid);
-		ZERO_STRUCTP(r->out.sid);
-	}
-	if (flags & NDR_OUT) {
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->out.sid);
-		}
-		_mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.sid, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sid));
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_UidToSid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_UidToSid *r)
-{
-	ndr_print_struct(ndr, name, "unixinfo_UidToSid");
-	ndr->depth++;
-	if (flags & NDR_SET_VALUES) {
-		ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-	}
-	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "unixinfo_UidToSid");
-		ndr->depth++;
-		ndr_print_hyper(ndr, "uid", r->in.uid);
-		ndr->depth--;
-	}
-	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "unixinfo_UidToSid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "sid", r->out.sid);
-		ndr->depth++;
-		ndr_print_dom_sid(ndr, "sid", r->out.sid);
-		ndr->depth--;
-		ndr_print_NTSTATUS(ndr, "result", r->out.result);
-		ndr->depth--;
-	}
-	ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_unixinfo_SidToGid(struct ndr_push *ndr, int flags, const struct unixinfo_SidToGid *r)
-{
-	if (flags & NDR_IN) {
-		NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sid));
-	}
-	if (flags & NDR_OUT) {
-		if (r->out.gid == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, *r->out.gid));
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_SidToGid(struct ndr_pull *ndr, int flags, struct unixinfo_SidToGid *r)
-{
-	TALLOC_CTX *_mem_save_gid_0;
-	if (flags & NDR_IN) {
-		ZERO_STRUCT(r->out);
-
-		NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sid));
-		NDR_PULL_ALLOC(ndr, r->out.gid);
-		ZERO_STRUCTP(r->out.gid);
-	}
-	if (flags & NDR_OUT) {
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->out.gid);
-		}
-		_mem_save_gid_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.gid, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, r->out.gid));
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_gid_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_SidToGid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_SidToGid *r)
-{
-	ndr_print_struct(ndr, name, "unixinfo_SidToGid");
-	ndr->depth++;
-	if (flags & NDR_SET_VALUES) {
-		ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-	}
-	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "unixinfo_SidToGid");
-		ndr->depth++;
-		ndr_print_dom_sid(ndr, "sid", &r->in.sid);
-		ndr->depth--;
-	}
-	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "unixinfo_SidToGid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "gid", r->out.gid);
-		ndr->depth++;
-		ndr_print_hyper(ndr, "gid", *r->out.gid);
-		ndr->depth--;
-		ndr_print_NTSTATUS(ndr, "result", r->out.result);
-		ndr->depth--;
-	}
-	ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_unixinfo_GidToSid(struct ndr_push *ndr, int flags, const struct unixinfo_GidToSid *r)
-{
-	if (flags & NDR_IN) {
-		NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->in.gid));
-	}
-	if (flags & NDR_OUT) {
-		if (r->out.sid == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sid));
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_GidToSid(struct ndr_pull *ndr, int flags, struct unixinfo_GidToSid *r)
-{
-	TALLOC_CTX *_mem_save_sid_0;
-	if (flags & NDR_IN) {
-		ZERO_STRUCT(r->out);
-
-		NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->in.gid));
-		NDR_PULL_ALLOC(ndr, r->out.sid);
-		ZERO_STRUCTP(r->out.sid);
-	}
-	if (flags & NDR_OUT) {
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->out.sid);
-		}
-		_mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.sid, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sid));
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_GidToSid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_GidToSid *r)
-{
-	ndr_print_struct(ndr, name, "unixinfo_GidToSid");
-	ndr->depth++;
-	if (flags & NDR_SET_VALUES) {
-		ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-	}
-	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "unixinfo_GidToSid");
-		ndr->depth++;
-		ndr_print_hyper(ndr, "gid", r->in.gid);
-		ndr->depth--;
-	}
-	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "unixinfo_GidToSid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "sid", r->out.sid);
-		ndr->depth++;
-		ndr_print_dom_sid(ndr, "sid", r->out.sid);
-		ndr->depth--;
-		ndr_print_NTSTATUS(ndr, "result", r->out.result);
-		ndr->depth--;
-	}
-	ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_unixinfo_GetPWUid(struct ndr_push *ndr, int flags, const struct unixinfo_GetPWUid *r)
-{
-	uint32_t cntr_uids_0;
-	uint32_t cntr_infos_0;
-	if (flags & NDR_IN) {
-		if (r->in.count == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.count));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.count));
-		for (cntr_uids_0 = 0; cntr_uids_0 < *r->in.count; cntr_uids_0++) {
-			NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->in.uids[cntr_uids_0]));
-		}
-	}
-	if (flags & NDR_OUT) {
-		if (r->out.count == NULL) {
-			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-		}
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.count));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.count));
-		for (cntr_infos_0 = 0; cntr_infos_0 < *r->out.count; cntr_infos_0++) {
-			NDR_CHECK(ndr_push_unixinfo_GetPWUidInfo(ndr, NDR_SCALARS, &r->out.infos[cntr_infos_0]));
-		}
-		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-static enum ndr_err_code ndr_pull_unixinfo_GetPWUid(struct ndr_pull *ndr, int flags, struct unixinfo_GetPWUid *r)
-{
-	uint32_t cntr_uids_0;
-	uint32_t cntr_infos_0;
-	TALLOC_CTX *_mem_save_count_0;
-	TALLOC_CTX *_mem_save_uids_0;
-	TALLOC_CTX *_mem_save_infos_0;
-	if (flags & NDR_IN) {
-		ZERO_STRUCT(r->out);
-
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->in.count);
-		}
-		_mem_save_count_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->in.count, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.count));
-		if (*r->in.count < 0 || *r->in.count > 1023) {
-			return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
-		}
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_count_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_array_size(ndr, &r->in.uids));
-		NDR_PULL_ALLOC_N(ndr, r->in.uids, ndr_get_array_size(ndr, &r->in.uids));
-		_mem_save_uids_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->in.uids, 0);
-		for (cntr_uids_0 = 0; cntr_uids_0 < *r->in.count; cntr_uids_0++) {
-			NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->in.uids[cntr_uids_0]));
-		}
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_uids_0, 0);
-		NDR_PULL_ALLOC(ndr, r->out.count);
-		*r->out.count = *r->in.count;
-		if (r->in.uids) {
-			NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.uids, *r->in.count));
-		}
-	}
-	if (flags & NDR_OUT) {
-		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-			NDR_PULL_ALLOC(ndr, r->out.count);
-		}
-		_mem_save_count_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.count, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.count));
-		if (*r->out.count < 0 || *r->out.count > 1023) {
-			return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
-		}
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_count_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_array_size(ndr, &r->out.infos));
-		NDR_PULL_ALLOC_N(ndr, r->out.infos, ndr_get_array_size(ndr, &r->out.infos));
-		_mem_save_infos_0 = NDR_PULL_GET_MEM_CTX(ndr);
-		NDR_PULL_SET_MEM_CTX(ndr, r->out.infos, 0);
-		for (cntr_infos_0 = 0; cntr_infos_0 < *r->out.count; cntr_infos_0++) {
-			NDR_CHECK(ndr_pull_unixinfo_GetPWUidInfo(ndr, NDR_SCALARS, &r->out.infos[cntr_infos_0]));
-		}
-		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_infos_0, 0);
-		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
-		if (r->out.infos) {
-			NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.infos, *r->out.count));
-		}
-	}
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_unixinfo_GetPWUid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_GetPWUid *r)
-{
-	uint32_t cntr_uids_0;
-	uint32_t cntr_infos_0;
-	ndr_print_struct(ndr, name, "unixinfo_GetPWUid");
-	ndr->depth++;
-	if (flags & NDR_SET_VALUES) {
-		ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-	}
-	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "unixinfo_GetPWUid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "count", r->in.count);
-		ndr->depth++;
-		ndr_print_uint32(ndr, "count", *r->in.count);
-		ndr->depth--;
-		ndr->print(ndr, "%s: ARRAY(%d)", "uids", *r->in.count);
-		ndr->depth++;
-		for (cntr_uids_0=0;cntr_uids_0<*r->in.count;cntr_uids_0++) {
-			char *idx_0=NULL;
-			if (asprintf(&idx_0, "[%d]", cntr_uids_0) != -1) {
-				ndr_print_hyper(ndr, "uids", r->in.uids[cntr_uids_0]);
-				free(idx_0);
-			}
-		}
-		ndr->depth--;
-		ndr->depth--;
-	}
-	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "unixinfo_GetPWUid");
-		ndr->depth++;
-		ndr_print_ptr(ndr, "count", r->out.count);
-		ndr->depth++;
-		ndr_print_uint32(ndr, "count", *r->out.count);
-		ndr->depth--;
-		ndr->print(ndr, "%s: ARRAY(%d)", "infos", *r->out.count);
-		ndr->depth++;
-		for (cntr_infos_0=0;cntr_infos_0<*r->out.count;cntr_infos_0++) {
-			char *idx_0=NULL;
-			if (asprintf(&idx_0, "[%d]", cntr_infos_0) != -1) {
-				ndr_print_unixinfo_GetPWUidInfo(ndr, "infos", &r->out.infos[cntr_infos_0]);
-				free(idx_0);
-			}
-		}
-		ndr->depth--;
-		ndr_print_NTSTATUS(ndr, "result", r->out.result);
-		ndr->depth--;
-	}
-	ndr->depth--;
-}
-
-static const struct ndr_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 }
-};
-
-static const char * const unixinfo_endpoint_strings[] = {
-	"ncacn_np:[\\pipe\\unixinfo]", 
-	"ncacn_ip_tcp:", 
-	"ncalrpc:", 
-};
-
-static const struct ndr_interface_string_array unixinfo_endpoints = {
-	.count	= 3,
-	.names	= unixinfo_endpoint_strings
-};
-
-static const char * const unixinfo_authservice_strings[] = {
-	"host", 
-};
-
-static const struct ndr_interface_string_array unixinfo_authservices = {
-	.count	= 3,
-	.names	= unixinfo_authservice_strings
-};
-
-
-const struct ndr_interface_table ndr_table_unixinfo = {
-	.name		= "unixinfo",
-	.syntax_id	= {
-		{0x9c54e310,0xa955,0x4885,{0xbd,0x31},{0x78,0x78,0x71,0x47,0xdf,0xa6}},
-		NDR_UNIXINFO_VERSION
-	},
-	.helpstring	= NDR_UNIXINFO_HELPSTRING,
-	.num_calls	= 5,
-	.calls		= unixinfo_calls,
-	.endpoints	= &unixinfo_endpoints,
-	.authservices	= &unixinfo_authservices
-};
-
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.h b/source3/librpc/gen_ndr/ndr_unixinfo.h
deleted file mode 100644
index 17f8b811db..0000000000
--- a/source3/librpc/gen_ndr/ndr_unixinfo.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* header auto-generated by pidl */
-
-#include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/unixinfo.h"
-
-#ifndef _HEADER_NDR_unixinfo
-#define _HEADER_NDR_unixinfo
-
-#define NDR_UNIXINFO_UUID "9c54e310-a955-4885-bd31-78787147dfa6"
-#define NDR_UNIXINFO_VERSION 0.0
-#define NDR_UNIXINFO_NAME "unixinfo"
-#define NDR_UNIXINFO_HELPSTRING "Unixinfo specific stuff"
-extern const struct ndr_interface_table ndr_table_unixinfo;
-#define NDR_UNIXINFO_SIDTOUID (0x00)
-
-#define NDR_UNIXINFO_UIDTOSID (0x01)
-
-#define NDR_UNIXINFO_SIDTOGID (0x02)
-
-#define NDR_UNIXINFO_GIDTOSID (0x03)
-
-#define NDR_UNIXINFO_GETPWUID (0x04)
-
-#define NDR_UNIXINFO_CALL_COUNT (5)
-void ndr_print_unixinfo_GetPWUidInfo(struct ndr_print *ndr, const char *name, const struct unixinfo_GetPWUidInfo *r);
-void ndr_print_unixinfo_SidToUid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_SidToUid *r);
-void ndr_print_unixinfo_UidToSid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_UidToSid *r);
-void ndr_print_unixinfo_SidToGid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_SidToGid *r);
-void ndr_print_unixinfo_GidToSid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_GidToSid *r);
-void ndr_print_unixinfo_GetPWUid(struct ndr_print *ndr, const char *name, int flags, const struct unixinfo_GetPWUid *r);
-#endif /* _HEADER_NDR_unixinfo */
diff --git a/source3/librpc/gen_ndr/srv_unixinfo.c b/source3/librpc/gen_ndr/srv_unixinfo.c
deleted file mode 100644
index 6142bb113f..0000000000
--- a/source3/librpc/gen_ndr/srv_unixinfo.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * server auto-generated by pidl. DO NOT MODIFY!
- */
-
-#include "includes.h"
-#include "librpc/gen_ndr/srv_unixinfo.h"
-
-static bool api_unixinfo_SidToUid(pipes_struct *p)
-{
-	const struct ndr_interface_call *call;
-	struct ndr_pull *pull;
-	struct ndr_push *push;
-	enum ndr_err_code ndr_err;
-	DATA_BLOB blob;
-	struct unixinfo_SidToUid *r;
-
-	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_SIDTOUID];
-
-	r = talloc(talloc_tos(), struct unixinfo_SidToUid);
-	if (r == NULL) {
-		return false;
-	}
-
-	if (!prs_data_blob(&p->in_data.data, &blob, r)) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull = ndr_pull_init_blob(&blob, r);
-	if (pull == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull->flags |= LIBNDR_FLAG_REF_ALLOC;
-	ndr_err = call->ndr_pull(pull, NDR_IN, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_SidToUid, r);
-	}
-
-	ZERO_STRUCT(r->out);
-	r->out.uid = talloc_zero(r, uint64_t);
-	if (r->out.uid == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	r->out.result = _unixinfo_SidToUid(p, r);
-
-	if (p->rng_fault_state) {
-		talloc_free(r);
-		/* Return true here, srv_pipe_hnd.c will take care */
-		return true;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_SidToUid, r);
-	}
-
-	push = ndr_push_init_ctx(r);
-	if (push == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	ndr_err = call->ndr_push(push, NDR_OUT, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	blob = ndr_push_blob(push);
-	if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
-		talloc_free(r);
-		return false;
-	}
-
-	talloc_free(r);
-
-	return true;
-}
-
-static bool api_unixinfo_UidToSid(pipes_struct *p)
-{
-	const struct ndr_interface_call *call;
-	struct ndr_pull *pull;
-	struct ndr_push *push;
-	enum ndr_err_code ndr_err;
-	DATA_BLOB blob;
-	struct unixinfo_UidToSid *r;
-
-	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_UIDTOSID];
-
-	r = talloc(talloc_tos(), struct unixinfo_UidToSid);
-	if (r == NULL) {
-		return false;
-	}
-
-	if (!prs_data_blob(&p->in_data.data, &blob, r)) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull = ndr_pull_init_blob(&blob, r);
-	if (pull == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull->flags |= LIBNDR_FLAG_REF_ALLOC;
-	ndr_err = call->ndr_pull(pull, NDR_IN, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_UidToSid, r);
-	}
-
-	ZERO_STRUCT(r->out);
-	r->out.sid = talloc_zero(r, struct dom_sid);
-	if (r->out.sid == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	r->out.result = _unixinfo_UidToSid(p, r);
-
-	if (p->rng_fault_state) {
-		talloc_free(r);
-		/* Return true here, srv_pipe_hnd.c will take care */
-		return true;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_UidToSid, r);
-	}
-
-	push = ndr_push_init_ctx(r);
-	if (push == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	ndr_err = call->ndr_push(push, NDR_OUT, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	blob = ndr_push_blob(push);
-	if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
-		talloc_free(r);
-		return false;
-	}
-
-	talloc_free(r);
-
-	return true;
-}
-
-static bool api_unixinfo_SidToGid(pipes_struct *p)
-{
-	const struct ndr_interface_call *call;
-	struct ndr_pull *pull;
-	struct ndr_push *push;
-	enum ndr_err_code ndr_err;
-	DATA_BLOB blob;
-	struct unixinfo_SidToGid *r;
-
-	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_SIDTOGID];
-
-	r = talloc(talloc_tos(), struct unixinfo_SidToGid);
-	if (r == NULL) {
-		return false;
-	}
-
-	if (!prs_data_blob(&p->in_data.data, &blob, r)) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull = ndr_pull_init_blob(&blob, r);
-	if (pull == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull->flags |= LIBNDR_FLAG_REF_ALLOC;
-	ndr_err = call->ndr_pull(pull, NDR_IN, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_SidToGid, r);
-	}
-
-	ZERO_STRUCT(r->out);
-	r->out.gid = talloc_zero(r, uint64_t);
-	if (r->out.gid == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	r->out.result = _unixinfo_SidToGid(p, r);
-
-	if (p->rng_fault_state) {
-		talloc_free(r);
-		/* Return true here, srv_pipe_hnd.c will take care */
-		return true;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_SidToGid, r);
-	}
-
-	push = ndr_push_init_ctx(r);
-	if (push == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	ndr_err = call->ndr_push(push, NDR_OUT, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	blob = ndr_push_blob(push);
-	if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
-		talloc_free(r);
-		return false;
-	}
-
-	talloc_free(r);
-
-	return true;
-}
-
-static bool api_unixinfo_GidToSid(pipes_struct *p)
-{
-	const struct ndr_interface_call *call;
-	struct ndr_pull *pull;
-	struct ndr_push *push;
-	enum ndr_err_code ndr_err;
-	DATA_BLOB blob;
-	struct unixinfo_GidToSid *r;
-
-	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_GIDTOSID];
-
-	r = talloc(talloc_tos(), struct unixinfo_GidToSid);
-	if (r == NULL) {
-		return false;
-	}
-
-	if (!prs_data_blob(&p->in_data.data, &blob, r)) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull = ndr_pull_init_blob(&blob, r);
-	if (pull == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull->flags |= LIBNDR_FLAG_REF_ALLOC;
-	ndr_err = call->ndr_pull(pull, NDR_IN, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_GidToSid, r);
-	}
-
-	ZERO_STRUCT(r->out);
-	r->out.sid = talloc_zero(r, struct dom_sid);
-	if (r->out.sid == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	r->out.result = _unixinfo_GidToSid(p, r);
-
-	if (p->rng_fault_state) {
-		talloc_free(r);
-		/* Return true here, srv_pipe_hnd.c will take care */
-		return true;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_GidToSid, r);
-	}
-
-	push = ndr_push_init_ctx(r);
-	if (push == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	ndr_err = call->ndr_push(push, NDR_OUT, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	blob = ndr_push_blob(push);
-	if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
-		talloc_free(r);
-		return false;
-	}
-
-	talloc_free(r);
-
-	return true;
-}
-
-static bool api_unixinfo_GetPWUid(pipes_struct *p)
-{
-	const struct ndr_interface_call *call;
-	struct ndr_pull *pull;
-	struct ndr_push *push;
-	enum ndr_err_code ndr_err;
-	DATA_BLOB blob;
-	struct unixinfo_GetPWUid *r;
-
-	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_GETPWUID];
-
-	r = talloc(talloc_tos(), struct unixinfo_GetPWUid);
-	if (r == NULL) {
-		return false;
-	}
-
-	if (!prs_data_blob(&p->in_data.data, &blob, r)) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull = ndr_pull_init_blob(&blob, r);
-	if (pull == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	pull->flags |= LIBNDR_FLAG_REF_ALLOC;
-	ndr_err = call->ndr_pull(pull, NDR_IN, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(unixinfo_GetPWUid, r);
-	}
-
-	ZERO_STRUCT(r->out);
-	r->out.count = r->in.count;
-	r->out.infos = talloc_zero_array(r, struct unixinfo_GetPWUidInfo, *r->out.count);
-	if (r->out.infos == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	r->out.result = _unixinfo_GetPWUid(p, r);
-
-	if (p->rng_fault_state) {
-		talloc_free(r);
-		/* Return true here, srv_pipe_hnd.c will take care */
-		return true;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(unixinfo_GetPWUid, r);
-	}
-
-	push = ndr_push_init_ctx(r);
-	if (push == NULL) {
-		talloc_free(r);
-		return false;
-	}
-
-	ndr_err = call->ndr_push(push, NDR_OUT, r);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		talloc_free(r);
-		return false;
-	}
-
-	blob = ndr_push_blob(push);
-	if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
-		talloc_free(r);
-		return false;
-	}
-
-	talloc_free(r);
-
-	return true;
-}
-
-
-/* Tables */
-static struct api_struct api_unixinfo_cmds[] = 
-{
-	{"UNIXINFO_SIDTOUID", NDR_UNIXINFO_SIDTOUID, api_unixinfo_SidToUid},
-	{"UNIXINFO_UIDTOSID", NDR_UNIXINFO_UIDTOSID, api_unixinfo_UidToSid},
-	{"UNIXINFO_SIDTOGID", NDR_UNIXINFO_SIDTOGID, api_unixinfo_SidToGid},
-	{"UNIXINFO_GIDTOSID", NDR_UNIXINFO_GIDTOSID, api_unixinfo_GidToSid},
-	{"UNIXINFO_GETPWUID", NDR_UNIXINFO_GETPWUID, api_unixinfo_GetPWUid},
-};
-
-void unixinfo_get_pipe_fns(struct api_struct **fns, int *n_fns)
-{
-	*fns = api_unixinfo_cmds;
-	*n_fns = sizeof(api_unixinfo_cmds) / sizeof(struct api_struct);
-}
-
-NTSTATUS rpc_unixinfo_init(void)
-{
-	return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "unixinfo", "unixinfo", api_unixinfo_cmds, sizeof(api_unixinfo_cmds) / sizeof(struct api_struct));
-}
diff --git a/source3/librpc/gen_ndr/srv_unixinfo.h b/source3/librpc/gen_ndr/srv_unixinfo.h
deleted file mode 100644
index 6e5c033b61..0000000000
--- a/source3/librpc/gen_ndr/srv_unixinfo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "librpc/gen_ndr/ndr_unixinfo.h"
-#ifndef __SRV_UNIXINFO__
-#define __SRV_UNIXINFO__
-NTSTATUS _unixinfo_SidToUid(pipes_struct *p, struct unixinfo_SidToUid *r);
-NTSTATUS _unixinfo_UidToSid(pipes_struct *p, struct unixinfo_UidToSid *r);
-NTSTATUS _unixinfo_SidToGid(pipes_struct *p, struct unixinfo_SidToGid *r);
-NTSTATUS _unixinfo_GidToSid(pipes_struct *p, struct unixinfo_GidToSid *r);
-NTSTATUS _unixinfo_GetPWUid(pipes_struct *p, struct unixinfo_GetPWUid *r);
-void unixinfo_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_unixinfo_init(void);
-#endif /* __SRV_UNIXINFO__ */
diff --git a/source3/librpc/gen_ndr/unixinfo.h b/source3/librpc/gen_ndr/unixinfo.h
deleted file mode 100644
index bfe0934ccd..0000000000
--- a/source3/librpc/gen_ndr/unixinfo.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* header auto-generated by pidl */
-
-#include <stdint.h>
-
-#include "librpc/gen_ndr/security.h"
-#ifndef _HEADER_unixinfo
-#define _HEADER_unixinfo
-
-struct unixinfo_GetPWUidInfo {
-	NTSTATUS status;
-	const char * homedir;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-	const char * shell;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-};
-
-
-struct unixinfo_SidToUid {
-	struct {
-		struct dom_sid sid;
-	} in;
-
-	struct {
-		uint64_t *uid;/* [ref] */
-		NTSTATUS result;
-	} out;
-
-};
-
-
-struct unixinfo_UidToSid {
-	struct {
-		uint64_t uid;
-	} in;
-
-	struct {
-		struct dom_sid *sid;/* [ref] */
-		NTSTATUS result;
-	} out;
-
-};
-
-
-struct unixinfo_SidToGid {
-	struct {
-		struct dom_sid sid;
-	} in;
-
-	struct {
-		uint64_t *gid;/* [ref] */
-		NTSTATUS result;
-	} out;
-
-};
-
-
-struct unixinfo_GidToSid {
-	struct {
-		uint64_t gid;
-	} in;
-
-	struct {
-		struct dom_sid *sid;/* [ref] */
-		NTSTATUS result;
-	} out;
-
-};
-
-
-struct unixinfo_GetPWUid {
-	struct {
-		uint64_t *uids;/* [size_is(*count)] */
-		uint32_t *count;/* [ref,range(0,1023)] */
-	} in;
-
-	struct {
-		struct unixinfo_GetPWUidInfo *infos;/* [size_is(*count)] */
-		uint32_t *count;/* [ref,range(0,1023)] */
-		NTSTATUS result;
-	} out;
-
-};
-
-#endif /* _HEADER_unixinfo */
diff --git a/source3/librpc/idl/unixinfo.idl b/source3/librpc/idl/unixinfo.idl
deleted file mode 100644
index 48bc565fff..0000000000
--- a/source3/librpc/idl/unixinfo.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "idl_types.h"
-/*
-  Unixinfo interface definition
-*/
-
-import "security.idl";
-
-[ uuid("9c54e310-a955-4885-bd31-78787147dfa6"),
-  version(0.0),
-  endpoint("ncacn_np:[\\pipe\\unixinfo]", "ncacn_ip_tcp:", "ncalrpc:"),
-  pointer_default(unique),
-  helpstring("Unixinfo specific stuff")
-] interface unixinfo
-{
-	/******************/
-	/* Function: 0x00 */
-	NTSTATUS unixinfo_SidToUid (
-	    [in]	dom_sid sid,
-	    [out]	hyper *uid
-	    );
-
-	/******************/
-	/* Function: 0x01 */
-	NTSTATUS unixinfo_UidToSid (
-	    [in]	hyper uid,
-	    [out]	dom_sid *sid
-	    );
-
-	/******************/
-	/* Function: 0x02 */
-	NTSTATUS unixinfo_SidToGid (
-	    [in]	dom_sid sid,
-	    [out]	hyper *gid
-	    );
-
-	/******************/
-	/* Function: 0x03 */
-	NTSTATUS unixinfo_GidToSid (
-	    [in]	hyper gid,
-	    [out]	dom_sid *sid
-	    );
-
-	typedef struct {
-		NTSTATUS status;
-		utf8string homedir;
-		utf8string shell;
-	} unixinfo_GetPWUidInfo;
-
-	/******************/
-	/* Function: 0x04 */
-        NTSTATUS unixinfo_GetPWUid (
-		[in,out,ref,range(0,1023)] uint32 *count,
-		[in,size_is(*count)] hyper uids[],
-		[out,size_is(*count)] unixinfo_GetPWUidInfo infos[*]
-        );
-}