diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-09 17:08:20 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-09 17:08:20 -0800 |
| commit | 9003e8e50fd308bb66bfbd635193e725b2442cbb (patch) | |
| tree | 9c737da896df975094afe5bcb1739d2d942420b8 | |
| parent | 5df6018114ca54d97a7d67d554a090a56270d45e (diff) | |
| parent | ba6eaa690622c8b3202135cb21b690df660afa63 (diff) | |
| download | samba-9003e8e50fd308bb66bfbd635193e725b2442cbb.tar.gz samba-9003e8e50fd308bb66bfbd635193e725b2442cbb.tar.bz2 samba-9003e8e50fd308bb66bfbd635193e725b2442cbb.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit f98c68a8a4882cb0a1b7e8985f3eba5ebb8287e3)
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/libaddns/dns.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index 5eb85c727d..d69928cf16 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6494,6 +6494,8 @@ SMB_MODULE(vfs_readahead, \$(VFS_READAHEAD_OBJ), "bin/readahead.$SHLIBEXT", VFS) SMB_MODULE(vfs_fileid, \$(VFS_FILEID_OBJ), "bin/fileid.$SHLIBEXT", VFS) SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS) SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS) +SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS) + SMB_SUBSYSTEM(VFS,smbd/vfs.o) diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index 188d139808..cf842f4d10 100644 --- a/source3/libaddns/dns.h +++ b/source3/libaddns/dns.h @@ -26,6 +26,7 @@ #define _DNS_H #include "lib/replace/replace.h" +#include "system/network.h" /* make sure we have included the correct config.h */ #ifndef NO_CONFIG_H /* for some tests */ |