svn commit: samba r19794 - in branches/SAMBA_3_0/source:
librpc/gen_ndr rpcclient
vlendec at samba.org
vlendec at samba.org
Sun Nov 19 18:22:21 GMT 2006
Author: vlendec
Date: 2006-11-19 18:22:20 +0000 (Sun, 19 Nov 2006)
New Revision: 19794
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19794
Log:
Convert DFS
Modified:
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.c
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.h
branches/SAMBA_3_0/source/rpcclient/cmd_dfs.c
Changeset:
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.c 2006-11-19 18:06:08 UTC (rev 19793)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.c 2006-11-19 18:22:20 UTC (rev 19794)
@@ -165,7 +165,7 @@
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *unknown, uint32_t *total)
+NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct **info, uint32_t *unknown, uint32_t **total)
{
struct dfs_Enum r;
NTSTATUS status;
@@ -173,9 +173,9 @@
/* In parameters */
r.in.level = level;
r.in.bufsize = bufsize;
- r.in.info = info;
+ r.in.info = *info;
r.in.unknown = unknown;
- r.in.total = total;
+ r.in.total = *total;
if (DEBUGLEVEL >= 10)
NDR_PRINT_IN_DEBUG(dfs_Enum, &r);
@@ -194,12 +194,8 @@
}
/* Return variables */
- if ( info ) {
- *info = *r.out.info;
- }
- if ( total ) {
- *total = *r.out.total;
- }
+ *info = r.out.info;
+ *total = r.out.total;
/* Return result */
return werror_to_ntstatus(r.out.result);
@@ -640,7 +636,7 @@
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total)
+NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct **info, uint32_t **total)
{
struct dfs_EnumEx r;
NTSTATUS status;
@@ -649,8 +645,8 @@
r.in.name = name;
r.in.level = level;
r.in.bufsize = bufsize;
- r.in.info = info;
- r.in.total = total;
+ r.in.info = *info;
+ r.in.total = *total;
if (DEBUGLEVEL >= 10)
NDR_PRINT_IN_DEBUG(dfs_EnumEx, &r);
@@ -669,12 +665,8 @@
}
/* Return variables */
- if ( info ) {
- *info = *r.out.info;
- }
- if ( total ) {
- *total = *r.out.total;
- }
+ *info = r.out.info;
+ *total = r.out.total;
/* Return result */
return werror_to_ntstatus(r.out.result);
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.h 2006-11-19 18:06:08 UTC (rev 19793)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.h 2006-11-19 18:22:20 UTC (rev 19794)
@@ -6,7 +6,7 @@
NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share);
NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share, uint32_t level, union dfs_Info *info);
-NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *unknown, uint32_t *total);
+NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct **info, uint32_t *unknown, uint32_t **total);
NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
@@ -22,6 +22,6 @@
NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
-NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total);
+NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct **info, uint32_t **total);
NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx);
#endif /* __CLI_NETDFS__ */
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_dfs.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_dfs.c 2006-11-19 18:06:08 UTC (rev 19793)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_dfs.c 2006-11-19 18:22:20 UTC (rev 19794)
@@ -174,6 +174,7 @@
int argc, const char **argv)
{
struct dfs_EnumStruct str;
+ struct dfs_EnumStruct *pstr = &str;
struct dfs_EnumArray1 info1;
struct dfs_EnumArray2 info2;
struct dfs_EnumArray3 info3;
@@ -183,6 +184,7 @@
NTSTATUS result;
uint32 total = 0;
+ uint32 *ptotal = &total;
uint32 unknown = 0;
if (argc > 2) {
@@ -206,8 +208,8 @@
break;
}
- result = rpccli_dfs_Enum(cli, mem_ctx, str.level, 0xFFFFFFFF, &str, &unknown,
- &total);
+ result = rpccli_dfs_Enum(cli, mem_ctx, str.level, 0xFFFFFFFF, &pstr,
+ &unknown, &ptotal);
if (NT_STATUS_IS_OK(result))
display_dfs_enumstruct(&str);
@@ -221,6 +223,7 @@
int argc, const char **argv)
{
struct dfs_EnumStruct str;
+ struct dfs_EnumStruct *pstr = &str;
struct dfs_EnumArray1 info1;
struct dfs_EnumArray2 info2;
struct dfs_EnumArray3 info3;
@@ -230,6 +233,7 @@
NTSTATUS result;
uint32 total = 0;
+ uint32 *ptotal = &total;
if (argc < 2 || argc > 3) {
printf("Usage: %s dfs_name [info_level]\n", argv[0]);
@@ -251,9 +255,8 @@
break;
}
- result = rpccli_dfs_EnumEx(cli, mem_ctx, argv[1],
- str.level, 0xFFFFFFFF, &str,
- &total);
+ result = rpccli_dfs_EnumEx(cli, mem_ctx, argv[1], str.level,
+ 0xFFFFFFFF, &pstr, &ptotal);
if (NT_STATUS_IS_OK(result))
display_dfs_enumstruct(&str);
More information about the samba-cvs
mailing list