diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:49 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:49 +0100 |
| commit | 55c851c345aa23544afd96d6e770a51779ac8e6f (patch) | |
| tree | d00680489eb6184696802e1126e0334116c56225 | |
| parent | 1e0e3aa442502cdcdb083893fba8489f40d22312 (diff) | |
| download | samba-55c851c345aa23544afd96d6e770a51779ac8e6f.tar.gz samba-55c851c345aa23544afd96d6e770a51779ac8e6f.tar.xz samba-55c851c345aa23544afd96d6e770a51779ac8e6f.zip | |
Revert "Make use of ZERO_STRUCT (the first memset was actually wrong)"
This reverts commit 69de2806465742ea6f1ea96d75d2cb3be6b84284.
| -rw-r--r-- | source/modules/vfs_gpfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/modules/vfs_gpfs.c b/source/modules/vfs_gpfs.c index fe07097ec47..d10906dfb1e 100644 --- a/source/modules/vfs_gpfs.c +++ b/source/modules/vfs_gpfs.c @@ -179,7 +179,7 @@ static int gpfs_get_nfs4_acl(const char *fname, SMB4ACL_T **ppacl) "who: %d\n", gace->aceType, gace->aceIFlags, gace->aceFlags, gace->aceMask, gace->aceWho)); - ZERO_STRUCT(smbace); + memset(&smbace, 0, sizeof(SMB4ACE_T)); if (gace->aceIFlags & ACE4_IFLAG_SPECIAL_ID) { smbace.flags |= SMB_ACE4_ID_SPECIAL; switch (gace->aceWho) { @@ -744,7 +744,7 @@ static int gpfsacl_emu_chmod(const char *path, mode_t mode) if (haveAllowEntry[i]==True) continue; - ZERO_STRUCT(ace); + memset(&ace, 0, sizeof(SMB_ACE4PROP_T)); ace.aceType = SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE; ace.flags |= SMB_ACE4_ID_SPECIAL; ace.who.special_id = i; @@ -766,7 +766,7 @@ static int gpfsacl_emu_chmod(const char *path, mode_t mode) } /* don't add complementary DENY ACEs here */ - ZERO_STRUCT(fake_fsp); + memset(&fake_fsp, 0, sizeof(struct files_struct)); fake_fsp.fsp_name = (char *)path; /* no file_new is needed here */ /* put the acl */ |