diff options
| author | Christian Ambach <ambi@samba.org> | 2011-05-24 19:01:22 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2011-05-24 20:13:39 +0200 |
| commit | 53829fd4951fc1189d64ecef1c1f58d21f0fb38b (patch) | |
| tree | a956ca58a7305fb164cc8f0b523b6fdd084367cd /source3 | |
| parent | 425ac2c361fc1712c09b52f2cab0988597bf9b7e (diff) | |
| download | samba-53829fd4951fc1189d64ecef1c1f58d21f0fb38b.tar.gz samba-53829fd4951fc1189d64ecef1c1f58d21f0fb38b.tar.bz2 samba-53829fd4951fc1189d64ecef1c1f58d21f0fb38b.zip | |
s3:modules properly terminate enums in nfs4 acl code
same issue as with the audit modules:
using a wrong parameter leads to smbd crash as lp_enum()
will not terminate on last entry of the array
Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Tue May 24 20:13:39 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 91e98f6be8..c841d83db2 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -398,13 +398,15 @@ static int smbacl4_get_vfs_params( { static const struct enum_list enum_smbacl4_modes[] = { { e_simple, "simple" }, - { e_special, "special" } + { e_special, "special" }, + { -1 , NULL } }; static const struct enum_list enum_smbacl4_acedups[] = { { e_dontcare, "dontcare" }, { e_reject, "reject" }, { e_ignore, "ignore" }, { e_merge, "merge" }, + { -1 , NULL } }; memset(params, 0, sizeof(smbacl4_vfs_params)); |