diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-09 10:47:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-09 10:47:23 +1000 |
| commit | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (patch) | |
| tree | b9b0291e764d49586bab6388353a59515353a66e /source4/librpc/idl | |
| parent | f446bf59e300a53f4564bcf99d8614b440905147 (diff) | |
| parent | ca6ac11b46a75bf02cf873c6aedb4f85af227168 (diff) | |
| download | samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.tar.gz samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.tar.bz2 samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 2db0e86fb4abc27eed2d35e1d41122bc89a2c5fe)
Diffstat (limited to 'source4/librpc/idl')
| -rw-r--r-- | source4/librpc/idl/xattr.idl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl index 7e73baee7d..2010d51ce1 100644 --- a/source4/librpc/idl/xattr.idl +++ b/source4/librpc/idl/xattr.idl @@ -31,8 +31,14 @@ interface xattr NTTIME change_time; } xattr_DosInfo1; - const int XATTR_ATTRIB_FLAG_STICKY_WRITE_TIME = 0x1; +/* + We use xattrDosInfo1 again when we store values. + Because the sticky write time is now stored in the opendb + and xattr_DosInfo2Old is only present to parse existing + values from disk. + const int XATTR_ATTRIB_FLAG_STICKY_WRITE_TIME = 0x1; +*/ typedef struct { uint32 flags; uint32 attrib; @@ -43,11 +49,11 @@ interface xattr NTTIME change_time; NTTIME write_time; /* only used when sticky write time is set */ utf8string name; - } xattr_DosInfo2; + } xattr_DosInfo2Old; typedef [switch_type(uint16)] union { [case(1)] xattr_DosInfo1 info1; - [case(2)] xattr_DosInfo2 info2; + [case(2)] xattr_DosInfo2Old oldinfo2; } xattr_DosInfo; typedef [public] struct { |