[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-366-g4689057

Günther Deschner gd at samba.org
Fri Mar 21 03:18:00 GMT 2008


The branch, v3-2-test has been updated
       via  4689057f63599ebaf9ce658ca3b3168b2bbe531f (commit)
       via  a5f0186f70abe8dba650265219e69ce5ca2fb642 (commit)
       via  0244734cc5c682a73f84e2fe0a52a15090063d93 (commit)
       via  4e36657275caa77bc9712fe627aeb6fe4aefc151 (commit)
       via  54554683d63575cfdfa24f89952737ccf7ae5bc0 (commit)
       via  5d14938b14f8e59608771b1899fd473d63f3bde1 (commit)
       via  a01588d65f67ac23a5a2a741bb0419830e42868c (commit)
       via  51467443f70a53c3290f26f94cdaf8a64f58c2af (commit)
       via  b8714e03e70070b5dfb1a0b15b191dfac0634c44 (commit)
       via  f1b93c24fea0441deb5319f6fc4df0373d0dc939 (commit)
      from  1a5e5bf38f409b10c8b1da6227722c7d3976b175 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 4689057f63599ebaf9ce658ca3b3168b2bbe531f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 04:13:49 2008 +0100

    Add my copyright.
    
    Guenther

commit a5f0186f70abe8dba650265219e69ce5ca2fb642
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 04:12:52 2008 +0100

    Remove remaining old srvsvc client and server rpc code entirely.
    
    Guenther

commit 0244734cc5c682a73f84e2fe0a52a15090063d93
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 03:59:02 2008 +0100

    Remove double RPC_PARSE_OBJ2 from Makefile.
    
    Guenther

commit 4e36657275caa77bc9712fe627aeb6fe4aefc151
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 03:56:54 2008 +0100

    Move MAX.*ENTRY definitions out of old rpc srvsvc parsing code.
    
    Guenther

commit 54554683d63575cfdfa24f89952737ccf7ae5bc0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 03:53:18 2008 +0100

    Remove unused marshalling for SRV_NET_SESS_ENUM.
    
    Guenther

commit 5d14938b14f8e59608771b1899fd473d63f3bde1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 03:51:37 2008 +0100

    Use pidl for _srvsvc_NetSessEnum().
    
    Guenther

commit a01588d65f67ac23a5a2a741bb0419830e42868c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 03:50:49 2008 +0100

    Add support for setting resume handle in netsessenum rpcclient command.
    
    Guenther

commit 51467443f70a53c3290f26f94cdaf8a64f58c2af
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 02:01:58 2008 +0100

    Remove unused marshalling for SRV_NET_CONN_ENUM.
    
    Guenther

commit b8714e03e70070b5dfb1a0b15b191dfac0634c44
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 01:58:43 2008 +0100

    Use pidl for _srvsvc_NetConnEnum().
    
    Guenther

commit f1b93c24fea0441deb5319f6fc4df0373d0dc939
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 21 01:14:23 2008 +0100

    Allow to set or unset resume_handle in netconnenum in rpcclient.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in                |    5 +-
 source/configure.in               |    6 +-
 source/include/includes.h         |    1 -
 source/include/rpc_srvsvc.h       |  220 ------------
 source/rpc_parse/parse_srv.c      |  700 -------------------------------------
 source/rpc_server/srv_pipe.c      |    2 +-
 source/rpc_server/srv_srvsvc.c    |  294 ----------------
 source/rpc_server/srv_srvsvc_nt.c |  477 +++++++++++--------------
 source/rpcclient/cmd_srvsvc.c     |   16 +-
 9 files changed, 226 insertions(+), 1495 deletions(-)
 delete mode 100644 source/include/rpc_srvsvc.h
 delete mode 100644 source/rpc_parse/parse_srv.c
 delete mode 100644 source/rpc_server/srv_srvsvc.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 5934db1..0abe3fd 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -302,8 +302,7 @@ RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 # that requires knowledge of security contexts
 RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o
 
-RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_srv.o
-RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_srv.o \
+RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o \
 		 rpc_client/init_netlogon.o \
 		 rpc_client/init_lsa.o \
 		 rpc_client/init_srvsvc.o
@@ -510,7 +509,7 @@ RPC_REG_OBJ =  rpc_server/srv_winreg_nt.o \
 
 RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
 
-RPC_SVC_OBJ = rpc_server/srv_srvsvc.o rpc_server/srv_srvsvc_nt.o \
+RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
 	      librpc/gen_ndr/srv_srvsvc.o
 
 RPC_WKS_OBJ =  librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
diff --git a/source/configure.in b/source/configure.in
index 2e6c109..8b227d0 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -400,7 +400,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_lsarpc 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"
+default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs2 rpc_netlogon rpc_netdfs rpc_srvsvc 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_xattr_tdb vfs_streams_xattr"
@@ -5998,7 +5998,7 @@ done
 
 dnl Always build these modules static
 MODULE_rpc_spoolss=STATIC
-MODULE_rpc_srvsvc2=STATIC
+MODULE_rpc_srvsvc=STATIC
 MODULE_idmap_tdb=STATIC
 MODULE_idmap_passdb=STATIC
 MODULE_idmap_nss=STATIC
@@ -6039,7 +6039,7 @@ SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl2.$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)
+SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog2.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
diff --git a/source/include/includes.h b/source/include/includes.h
index c56c3cf..15a7484 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN];
 #include "rpc_netlogon.h"
 #include "reg_objects.h"
 #include "reg_db.h"
-#include "rpc_srvsvc.h"
 #include "rpc_spoolss.h"
 #include "rpc_eventlog.h"
 #include "rpc_perfcount.h"
diff --git a/source/include/rpc_srvsvc.h b/source/include/rpc_srvsvc.h
deleted file mode 100644
index 0d24ec5..0000000
--- a/source/include/rpc_srvsvc.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   Copyright (C) Nigel Williams 2001
-   Copyright (C) Gerald (Jerry) Carter 2006.
-
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RPC_SRVSVC_H /* _RPC_SRVSVC_H */
-#define _RPC_SRVSVC_H 
-
-/* srvsvc pipe */
-#define SRV_NET_CONN_ENUM          0x08
-#define SRV_NET_FILE_ENUM          0x09
-#define SRV_NET_FILE_CLOSE         0x0b
-#define SRV_NET_SESS_ENUM          0x0c
-#define SRV_NET_SESS_DEL           0x0d
-#define SRV_NET_SHARE_ADD          0x0e
-#define SRV_NET_SHARE_ENUM_ALL     0x0f
-#define SRV_NET_SHARE_GET_INFO     0x10
-#define SRV_NET_SHARE_SET_INFO     0x11
-#define SRV_NET_SHARE_DEL          0x12
-#define SRV_NET_SHARE_DEL_STICKY   0x13
-#define SRV_NET_SRV_GET_INFO       0x15
-#define SRV_NET_SRV_SET_INFO       0x16
-#define SRV_NET_DISK_ENUM          0x17
-#define SRV_NET_REMOTE_TOD         0x1c
-#define SRV_NET_NAME_VALIDATE      0x21
-#define SRV_NET_SHARE_ENUM         0x24
-#define SRV_NET_FILE_QUERY_SECDESC 0x27
-#define SRV_NET_FILE_SET_SECDESC   0x28
-
-#define MAX_SERVER_DISK_ENTRIES 15
-
-/***************************/
-
-/* oops - this is going to take up a *massive* amount of stack. */
-/* the UNISTR2s already have 1024 uint16 chars in them... */
-
-#define MAX_SESS_ENTRIES 32
-
-typedef struct {
-	UNISTR2 *sharename;
-} SESS_INFO_0;
-
-typedef struct {
-	uint32 num_entries_read;
-	uint32 ptr_sess_info;
-	uint32 num_entries_read2;
-	SESS_INFO_0 info_0[MAX_SESS_ENTRIES];
-} SRV_SESS_INFO_0;
-
-typedef struct {
-	UNISTR2 *sharename;
-	UNISTR2 *username;
-	uint32 num_opens;
-	uint32 open_time;
-	uint32 idle_time;
-	uint32 user_flags;
-} SESS_INFO_1;
-
-typedef struct {
-	uint32 num_entries_read;
-	uint32 ptr_sess_info;
-	uint32 num_entries_read2;
-	SESS_INFO_1 info_1[MAX_SESS_ENTRIES];
-} SRV_SESS_INFO_1;
-
-typedef struct {
-	uint32 switch_value;
-	uint32 ptr_sess_ctr;
-	union {
-		SRV_SESS_INFO_0 info0; 
-		SRV_SESS_INFO_1 info1; 
-	} sess;
-
-} SRV_SESS_INFO_CTR;
-
-typedef struct {
-	UNISTR2 *servername;
-	UNISTR2 *qualifier;
-	UNISTR2 *username;
-	uint32 sess_level;
-	SRV_SESS_INFO_CTR *ctr;
-	uint32 preferred_len;
-	ENUM_HND enum_hnd;
-} SRV_Q_NET_SESS_ENUM;
-
-typedef struct {
-	uint32 sess_level; 
-	SRV_SESS_INFO_CTR *ctr;
-	uint32 total_entries;
-	ENUM_HND enum_hnd;
-	WERROR status;
-} SRV_R_NET_SESS_ENUM;
-
-/***************************/
-
-/* CONN_INFO_0 (pointers to level 0 connection info strings) */
-typedef struct ptr_conn_info0
-{
-	uint32 id; /* connection id. */
-
-} CONN_INFO_0;
-
-/* oops - this is going to take up a *massive* amount of stack. */
-/* the UNISTR2s already have 1024 uint16 chars in them... */
-#define MAX_CONN_ENTRIES 32
-
-/* SRV_CONN_INFO_0 */
-typedef struct srv_conn_info_0_info
-{
-	uint32 num_entries_read;                     /* EntriesRead */
-	uint32 ptr_conn_info;                       /* Buffer */
-	uint32 num_entries_read2;                    /* EntriesRead */
-
-	CONN_INFO_0     info_0    [MAX_CONN_ENTRIES]; /* connection entry pointers */
-
-} SRV_CONN_INFO_0;
-
-/* CONN_INFO_1 (pointers to level 1 connection info strings) */
-typedef struct ptr_conn_info1
-{
-	uint32 id;   /* connection id */
-	uint32 type; /* 0x3 */
-	uint32 num_opens;
-	uint32 num_users;
-	uint32 open_time;
-
-	uint32 ptr_usr_name; /* pointer to user name. */
-	uint32 ptr_net_name; /* pointer to network name (e.g IPC$). */
-
-} CONN_INFO_1;
-
-/* CONN_INFO_1_STR (level 1 connection info strings) */
-typedef struct str_conn_info1
-{
-	UNISTR2 uni_usr_name; /* unicode string of user */
-	UNISTR2 uni_net_name; /* unicode string of name */
-
-} CONN_INFO_1_STR;
-
-/* SRV_CONN_INFO_1 */
-typedef struct srv_conn_info_1_info
-{
-	uint32 num_entries_read;                     /* EntriesRead */
-	uint32 ptr_conn_info;                       /* Buffer */
-	uint32 num_entries_read2;                    /* EntriesRead */
-
-	CONN_INFO_1     info_1    [MAX_CONN_ENTRIES]; /* connection entry pointers */
-	CONN_INFO_1_STR info_1_str[MAX_CONN_ENTRIES]; /* connection entry strings */
-
-} SRV_CONN_INFO_1;
-
-/* SRV_CONN_INFO_CTR */
-typedef struct srv_conn_info_ctr_info
-{
-	uint32 switch_value;         /* switch value */
-	uint32 ptr_conn_ctr;       /* pointer to conn info union */
-	union
-    {
-		SRV_CONN_INFO_0 info0; /* connection info level 0 */
-		SRV_CONN_INFO_1 info1; /* connection info level 1 */
-
-    } conn;
-
-} SRV_CONN_INFO_CTR;
-
-
-/* SRV_Q_NET_CONN_ENUM */
-typedef struct q_net_conn_enum_info
-{
-	uint32 ptr_srv_name;         /* pointer (to server name) */
-	UNISTR2 uni_srv_name;        /* server name "\\server" */
-
-	uint32 ptr_qual_name;         /* pointer (to qualifier name) */
-	UNISTR2 uni_qual_name;        /* qualifier name "\\qualifier" */
-
-	uint32 conn_level;          /* connection level */
-
-	SRV_CONN_INFO_CTR *ctr;
-
-	uint32 preferred_len;        /* preferred maximum length (0xffff ffff) */
-	ENUM_HND enum_hnd;
-
-} SRV_Q_NET_CONN_ENUM;
-
-/* SRV_R_NET_CONN_ENUM */
-typedef struct r_net_conn_enum_info
-{
-	uint32 conn_level;          /* share level */
-
-	SRV_CONN_INFO_CTR *ctr;
-
-	uint32 total_entries;                    /* total number of entries */
-	ENUM_HND enum_hnd;
-
-	WERROR status;               /* return status */
-
-} SRV_R_NET_CONN_ENUM;
-
-/***************************/
-
-#endif /* _RPC_SRVSVC_H */
diff --git a/source/rpc_parse/parse_srv.c b/source/rpc_parse/parse_srv.c
deleted file mode 100644
index 9755254..0000000
--- a/source/rpc_parse/parse_srv.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997,
- *  Copyright (C) Jeremy Allison		    1999,
- *  Copyright (C) Nigel Williams		    2001,
- *  Copyright (C) Jim McDonough (jmcd at us.ibm.com)   2002.
- *  Copyright (C) Gerald (Jerry) Carter             2006.
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/*******************************************************************
- Inits a SESS_INFO_0_STR structure
-********************************************************************/
-
-void init_srv_sess_info0( SESS_INFO_0 *ss0, const char *name )
-{
-	ZERO_STRUCTP( ss0 );
-
-	if ( name ) {
-		if ( (ss0->sharename = TALLOC_P( talloc_tos(), UNISTR2 )) == NULL ) {
-			DEBUG(0,("init_srv_sess_info0: talloc failed!\n"));
-			return;
-		}
-		init_unistr2( ss0->sharename, name, UNI_STR_TERMINATE );
-	}
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-static bool srv_io_srv_sess_info_0(const char *desc, SRV_SESS_INFO_0 *ss0, prs_struct *ps, int depth)
-{
-	if (ss0 == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "srv_io_srv_sess_info_0");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("num_entries_read", ps, depth, &ss0->num_entries_read))
-		return False;
-	if(!prs_uint32("ptr_sess_info", ps, depth, &ss0->ptr_sess_info))
-		return False;
-
-	if (ss0->ptr_sess_info != 0) {
-		uint32 i;
-		uint32 num_entries = ss0->num_entries_read;
-
-		if (num_entries > MAX_SESS_ENTRIES) {
-			num_entries = MAX_SESS_ENTRIES; /* report this! */
-		}
-
-		if(!prs_uint32("num_entries_read2", ps, depth, &ss0->num_entries_read2))
-			return False;
-
-		SMB_ASSERT_ARRAY(ss0->info_0, num_entries);
-
-		/* first the pointers */
-		for (i = 0; i < num_entries; i++) {
-			if ( !prs_io_unistr2_p("", ps, depth, &ss0->info_0[i].sharename ) )
-				return False;
-		}
-
-		/* now the strings */
-		for (i = 0; i < num_entries; i++) {
-			if ( !prs_io_unistr2("sharename", ps, depth, ss0->info_0[i].sharename ))
-				return False;
-		}
-
-		if(!prs_align(ps))
-			return False;
-	}
-
-	return True;
-}
-
-/*******************************************************************
- Inits a SESS_INFO_1 structure
-********************************************************************/
-
-void init_srv_sess_info1( SESS_INFO_1 *ss1, const char *name, const char *user,
-                          uint32 num_opens, uint32 open_time, uint32 idle_time,
-                          uint32 user_flags)
-{
-	DEBUG(5,("init_srv_sess_info1: %s\n", name));
-
-	ZERO_STRUCTP( ss1 );
-
-	if ( name ) {
-		if ( (ss1->sharename = TALLOC_P( talloc_tos(), UNISTR2 )) == NULL ) {
-			DEBUG(0,("init_srv_sess_info0: talloc failed!\n"));
-			return;
-		}
-		init_unistr2( ss1->sharename, name, UNI_STR_TERMINATE );
-	}
-
-	if ( user ) {
-		if ( (ss1->username = TALLOC_P( talloc_tos(), UNISTR2 )) == NULL ) {
-			DEBUG(0,("init_srv_sess_info0: talloc failed!\n"));
-			return;
-		}
-		init_unistr2( ss1->username, user, UNI_STR_TERMINATE );
-	}
-
-	ss1->num_opens  = num_opens;
-	ss1->open_time  = open_time;
-	ss1->idle_time  = idle_time;
-	ss1->user_flags = user_flags;
-}
-
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-static bool srv_io_srv_sess_info_1(const char *desc, SRV_SESS_INFO_1 *ss1, prs_struct *ps, int depth)
-{
-	if (ss1 == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "srv_io_srv_sess_info_1");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("num_entries_read", ps, depth, &ss1->num_entries_read))
-		return False;
-	if(!prs_uint32("ptr_sess_info", ps, depth, &ss1->ptr_sess_info))
-		return False;
-
-	if (ss1->ptr_sess_info != 0) {
-		uint32 i;
-		uint32 num_entries = ss1->num_entries_read;
-
-		if (num_entries > MAX_SESS_ENTRIES) {
-			num_entries = MAX_SESS_ENTRIES; /* report this! */
-		}
-
-		if(!prs_uint32("num_entries_read2", ps, depth, &ss1->num_entries_read2))
-			return False;
-
-		SMB_ASSERT_ARRAY(ss1->info_1, num_entries);
-
-		/* first the pointers and flags */
-
-		for (i = 0; i < num_entries; i++) {
-
-			if ( !prs_io_unistr2_p("", ps, depth, &ss1->info_1[i].sharename ))
-				return False;
-			if ( !prs_io_unistr2_p("", ps, depth, &ss1->info_1[i].username ))
-				return False;
-
-			if(!prs_uint32("num_opens ", ps, depth, &ss1->info_1[i].num_opens))
-				return False;
-			if(!prs_uint32("open_time ", ps, depth, &ss1->info_1[i].open_time))
-				return False;
-			if(!prs_uint32("idle_time ", ps, depth, &ss1->info_1[i].idle_time))
-				return False;
-			if(!prs_uint32("user_flags", ps, depth, &ss1->info_1[i].user_flags))
-				return False;
-		}
-
-		/* now the strings */
-
-		for (i = 0; i < num_entries; i++) {
-			if ( !prs_io_unistr2("", ps, depth, ss1->info_1[i].sharename ))
-				return False;
-			if ( !prs_io_unistr2("", ps, depth, ss1->info_1[i].username ))
-				return False;
-		}
-
-		if(!prs_align(ps))
-			return False;
-	}
-
-	return True;
-}
-


-- 
Samba Shared Repository


More information about the samba-cvs mailing list