[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2356-g5300ff0
Günther Deschner
gd at samba.org
Sun Feb 17 22:31:17 GMT 2008
The branch, v3-2-test has been updated
via 5300ff01b9098ccd78cb38b4d6abc85b2d340a55 (commit)
via 0358ad7e933f6a0859000ba56e4bb88506d70610 (commit)
via 2a86e2f2d26886cfe87149dfc4f17049b21cb109 (commit)
via fc438c7ad684acdfb074e5eb7a1a102a41535240 (commit)
via 76bc44ecfb550a1d2aac003d2131aa145897b31c (commit)
via acce1092d90db1f90265de44fd340d7df73e4e0e (commit)
from 84a9bf0b7372bd7b7d4a1490c45e68b69889af8a (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 5300ff01b9098ccd78cb38b4d6abc85b2d340a55
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:17:51 2008 +0100
Use pidl for _PNP_GetVersion().
Guenther
commit 0358ad7e933f6a0859000ba56e4bb88506d70610
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:16:56 2008 +0100
Add very basic ntsvcs client to rpcclient.
Guenther
commit 2a86e2f2d26886cfe87149dfc4f17049b21cb109
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:29:35 2008 +0100
Re-run make idl.
Guenther
commit fc438c7ad684acdfb074e5eb7a1a102a41535240
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:14:47 2008 +0100
Fill in IDL for PNP_GetVersion (based from samba3).
Guenther
commit 76bc44ecfb550a1d2aac003d2131aa145897b31c
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:13:38 2008 +0100
Move all dummy ntsvcs calls to WERROR.
Guenther
commit acce1092d90db1f90265de44fd340d7df73e4e0e
Author: Günther Deschner <gd at samba.org>
Date: Sun Feb 17 23:03:22 2008 +0100
Build the generated ntsvcs server (not at all useable yet).
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 7 +-
source/configure.in | 4 +-
source/librpc/gen_ndr/cli_ntsvcs.c | 587 ++++++++++++++----
source/librpc/gen_ndr/cli_ntsvcs.h | 196 ++++--
source/librpc/gen_ndr/ndr_ntsvcs.c | 215 +++++++
source/librpc/gen_ndr/ntsvcs.h | 326 ++++++++--
source/librpc/gen_ndr/srv_ntsvcs.c | 137 +++--
source/librpc/gen_ndr/srv_ntsvcs.h | 130 ++--
source/librpc/idl/ntsvcs.idl | 391 ++++++++++--
source/rpc_server/srv_ntsvcs.c | 35 +-
source/rpc_server/srv_ntsvcs_nt.c | 647 +++++++++++++++++++-
source/rpc_server/srv_pipe.c | 2 +-
source/{lib/dummysmbd.c => rpcclient/cmd_ntsvcs.c} | 48 +-
source/rpcclient/rpcclient.c | 2 +
14 files changed, 2223 insertions(+), 504 deletions(-)
copy source/{lib/dummysmbd.c => rpcclient/cmd_ntsvcs.c} (52%)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 250d3f9..e380ad2 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -512,7 +512,8 @@ RPC_SVCCTL_OBJ = rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \
services/svc_netlogon.o services/svc_winreg.o \
services/svc_wins.o
-RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o
+RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o \
+ librpc/gen_ndr/srv_ntsvcs.o
RPC_DFS_OBJ = librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
@@ -739,8 +740,8 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
rpcclient/cmd_dfs.o \
rpcclient/cmd_dssetup.o rpcclient/cmd_echo.o \
rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \
- rpcclient/cmd_wkssvc.o \
- $(DISPLAY_SEC_OBJ) $(DISPLAY_DSDCINFO_OBJ)
+ rpcclient/cmd_wkssvc.o rpcclient/cmd_ntsvcs.o \
+ $(DISPLAY_SEC_OBJ)
RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
diff --git a/source/configure.in b/source/configure.in
index 1f8efb9..16c9ed9 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -745,7 +745,7 @@ AC_SUBST(DYNEXP)
dnl Add modules that have to be built by default here
dnl These have to be built static:
-default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template"
+default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs2 rpc_netlogon rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template"
dnl These are preferably build shared, and static if dlopen() is not available
default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_syncops vfs_xattr_tdb vfs_streams_xattr"
@@ -6615,7 +6615,7 @@ SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown.
SMB_MODULE(rpc_dssetup, \$(RPC_DSSETUP_OBJ), "bin/librpc_dssetup.$SHLIBEXT", RPC)
SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC)
SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl2.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_ntsvcs2, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs2.$SHLIBEXT", RPC)
SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC)
SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
SMB_MODULE(rpc_srvsvc2, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc2.$SHLIBEXT", RPC)
diff --git a/source/librpc/gen_ndr/cli_ntsvcs.c b/source/librpc/gen_ndr/cli_ntsvcs.c
index 7795962..da43d45 100644
--- a/source/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source/librpc/gen_ndr/cli_ntsvcs.c
@@ -7,7 +7,8 @@
#include "librpc/gen_ndr/cli_ntsvcs.h"
NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_Disconnect r;
NTSTATUS status;
@@ -40,11 +41,16 @@ NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_Connect r;
NTSTATUS status;
@@ -77,11 +83,17 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ uint16_t *version,
+ WERROR *werror)
{
struct PNP_GetVersion r;
NTSTATUS status;
@@ -112,13 +124,19 @@ NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
}
/* Return variables */
+ *version = *r.out.version;
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetGlobalState r;
NTSTATUS status;
@@ -151,11 +169,16 @@ NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_InitDetection r;
NTSTATUS status;
@@ -188,11 +211,16 @@ NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_ReportLogOn r;
NTSTATUS status;
@@ -225,11 +253,16 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_ValidateDeviceInstance r;
NTSTATUS status;
@@ -262,11 +295,16 @@ NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetRootDeviceInstance r;
NTSTATUS status;
@@ -299,11 +337,16 @@ NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetRelatedDeviceInstance r;
NTSTATUS status;
@@ -336,11 +379,16 @@ NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_EnumerateSubKeys r;
NTSTATUS status;
@@ -373,11 +421,16 @@ NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetDeviceList r;
NTSTATUS status;
@@ -410,11 +463,16 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetDeviceListSize r;
NTSTATUS status;
@@ -447,11 +505,16 @@ NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetDepth r;
NTSTATUS status;
@@ -484,11 +547,16 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetDeviceRegProp r;
NTSTATUS status;
@@ -521,11 +589,16 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_SetDeviceRegProp r;
NTSTATUS status;
@@ -558,11 +631,16 @@ NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetClassInstance r;
NTSTATUS status;
@@ -595,11 +673,16 @@ NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_CreateKey r;
NTSTATUS status;
@@ -632,11 +715,16 @@ NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_DeleteRegistryKey r;
NTSTATUS status;
@@ -669,11 +757,16 @@ NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetClassCount r;
NTSTATUS status;
@@ -706,11 +799,16 @@ NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetClassName r;
NTSTATUS status;
@@ -743,11 +841,16 @@ NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_DeleteClassKey r;
NTSTATUS status;
@@ -780,11 +883,16 @@ NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetInterfaceDeviceAlias r;
NTSTATUS status;
@@ -817,11 +925,16 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
struct PNP_GetInterfaceDeviceList r;
NTSTATUS status;
@@ -854,11 +967,16 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
/* Return variables */
/* Return result */
- return NT_STATUS_OK;
+ if (werror) {
+ *werror = r.out.result;
+ }
+
+ return werror_to_ntstatus(r.out.result);
}
NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx)
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list