[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  b3b6906 s3:vfs_acl_common: also parse xattr.NTACL version 1
       via  85da480 s3:wscript: add 'gssapi' dependecy to 'errors3'
      from  e568284 s3-passdb: split out passdb/pdb_ipa.h.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b3b69064d32c921c010b60d12551d450ed4be7c9
Author: Stefan Metzmacher <me...@samba.org>
Date:   Tue Oct 11 12:37:56 2011 +0200

    s3:vfs_acl_common: also parse xattr.NTACL version 1
    
    This is what the source4/ntvfs/posix code uses.
    It's also used at provision time to setup the sysvol permissions.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <me...@samba.org>
    Autobuild-Date: Tue Oct 11 14:16:25 CEST 2011 on sn-devel-104

commit 85da480c64b41f1d0e3722f6585f7c33e8724cf4
Author: Stefan Metzmacher <me...@samba.org>
Date:   Tue Oct 11 11:12:03 2011 +0200

    s3:wscript: add 'gssapi' dependecy to 'errors3'
    
    metze

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

Summary of changes:
 source3/modules/vfs_acl_common.c |   12 ++++++++++++
 source3/wscript_build            |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 2ed3cac..1947a77 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -93,6 +93,18 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
        }
 
        switch (xacl.version) {
+               case 1:
+                       *ppdesc = make_sec_desc(ctx, SD_REVISION,
+                                       xacl.info.sd->type | 
SEC_DESC_SELF_RELATIVE,
+                                       xacl.info.sd->owner_sid,
+                                       xacl.info.sd->group_sid,
+                                       xacl.info.sd->sacl,
+                                       xacl.info.sd->dacl,
+                                       &sd_size);
+                       /* No hash - null out. */
+                       *p_hash_type = XATTR_SD_HASH_TYPE_NONE;
+                       memset(hash, '\0', XATTR_SD_HASH_SIZE);
+                       break;
                case 2:
                        *ppdesc = make_sec_desc(ctx, SD_REVISION,
                                        xacl.info.sd_hs2->sd->type | 
SEC_DESC_SELF_RELATIVE,
diff --git a/source3/wscript_build b/source3/wscript_build
index c6a2dd5..ee49b0e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1045,7 +1045,7 @@ bld.SAMBA3_LIBRARY('CHARSET3',
 
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='libsmb/errormap.c libsmb/smberr.c 
lib/errmap_unix.c',
-                     deps='errors')
+                     deps='errors gssapi')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,


-- 
Samba Shared Repository