[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-969-g8c7509b

Stefan Metzmacher metze at samba.org
Thu Feb 21 11:44:02 GMT 2008


The branch, v4-0-test has been updated
       via  8c7509bd684ccdabcdb9ad9f75f3dd693ee9c416 (commit)
       via  24ec069751ef8db1211c50e7ca1e527adaa6432c (commit)
      from  78d22a28eca4dd89f629dbe75287e9ac3940606b (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 8c7509bd684ccdabcdb9ad9f75f3dd693ee9c416
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 19 16:40:48 2008 +0100

    srvsvc.idl: don't use STR_LEN4 anymore
    
    metze

commit 24ec069751ef8db1211c50e7ca1e527adaa6432c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 15 14:56:35 2008 +0100

    samr.idl: windows uses lsa_AsciiStringLarge in QueryDisplayInfo
    
    Tested with nt4 and w2k3.
    
    metze

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

Summary of changes:
 source/librpc/idl/samr.idl   |    2 +-
 source/librpc/idl/srvsvc.idl |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 2dc33fa..3a11ab7 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -960,7 +960,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
 	typedef struct {
 		uint32    idx;
-		lsa_AsciiString account_name;
+		lsa_AsciiStringLarge account_name;
 	} samr_DispEntryAscii;
 
 	typedef struct {
diff --git a/source/librpc/idl/srvsvc.idl b/source/librpc/idl/srvsvc.idl
index 66c52fa..8ef4941 100644
--- a/source/librpc/idl/srvsvc.idl
+++ b/source/librpc/idl/srvsvc.idl
@@ -1127,7 +1127,16 @@ import "security.idl", "svcctl.idl";
 /* srvsvc_NetDisk         */
 /**************************/
 	typedef struct {
-		[flag(STR_LEN4)] string disk;
+		/*
+		 * In theory this should be:
+		 *      [charset(UTF16),string] uint16 annotation[3]
+		 * But midl treats this as:
+		 *      [charset(UTF16),string] uint16 annotation[]
+		 * and pidl doesn't support this yet
+		 */
+		[value(0)] uint32 __disk_offset;
+		[value(strlen(disk)+1)] uint32 __disk_length;
+		[charset(UTF16)] uint16 disk[__disk_length];
 	} srvsvc_NetDiskInfo0;
 
 	typedef struct {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list