diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
| commit | 9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (patch) | |
| tree | 075bfaec7798dc54db47398ab6ebfe68c85b1573 /source3/include/includes.h | |
| parent | 7ab8f373c84c328b197f923287163e83371e7ccb (diff) | |
| parent | 8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e (diff) | |
| download | samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.gz samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.xz samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.zip | |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 7f8c408265..63c77ec182 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -594,7 +594,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "trans2.h" #include "../libcli/util/error.h" #include "ntioctl.h" -#include "../lib/util/charset/charset.h" +#include "charset.h" #include "dynconfig.h" #include "util_getent.h" #include "debugparse.h" @@ -703,6 +703,8 @@ enum flush_reason_enum { #ifndef NO_PROTO_H #include "proto.h" #endif +#include "libcli/security/secace.h" +#include "libcli/security/secacl.h" #if defined(HAVE_POSIX_ACLS) #include "modules/vfs_posixacl.h" |