[SCM] Samba Shared Repository - branch master updated - 25e7b21121d867a74c9e5241a8684e9937961fe3

2008-12-02 Thread Volker Lendecke 
The branch, master has been updated
   via  25e7b21121d867a74c9e5241a8684e9937961fe3 (commit)
  from  1bcd91366d582f4ba99ab64e99d057a4c3f94daf (commit)

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


- Log -
commit 25e7b21121d867a74c9e5241a8684e9937961fe3
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue Dec 2 09:51:46 2008 +0100

Attempt to fix a build failure on AIX

---

Summary of changes:
 source3/include/proto.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cc92867..f2bbb07 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5620,7 +5620,7 @@ void init_samr_DomInfo8(struct samr_DomInfo8 *r,
uint64_t sequence_num,
NTTIME domain_create_time);
 void init_samr_DomInfo9(struct samr_DomInfo9 *r,
-   uint32_t unknown);
+enum samr_DomainServerState domain_server_state);
 void init_samr_DomInfo12(struct samr_DomInfo12 *r,
 uint64_t lockout_duration,
 uint64_t lockout_window,


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4586-g5f0b797

2008-12-02 Thread Günther Deschner 
The branch, v3-3-test has been updated
   via  5f0b7973e04013cc5e3032cb2e96f5e718fb50b5 (commit)
  from  a264409ec6787ea5a45bdde00817e2dcac3bffa2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 5f0b7973e04013cc5e3032cb2e96f5e718fb50b5
Author: Günther Deschner [EMAIL PROTECTED]
Date:   Tue Dec 2 12:57:02 2008 +0100

s3-net: allow to list a keytab generated using net rpc vampire.

Guenther
(cherry picked from commit c554080dd988791ec2db37c96ff7cc709b0ee6ab)

---

Summary of changes:
 source/libads/kerberos_keytab.c |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/kerberos_keytab.c b/source/libads/kerberos_keytab.c
index 883f582..c4e6709 100644
--- a/source/libads/kerberos_keytab.c
+++ b/source/libads/kerberos_keytab.c
@@ -725,8 +725,11 @@ int ads_keytab_list(const char *keytab_name)
 
ret = smb_krb5_enctype_to_string(context, enctype, etype_s);
if (ret) {
-   SAFE_FREE(princ_s);
-   goto out;
+   if (asprintf(etype_s, UNKNOWN: %d\n, enctype) == -1)
+   {
+   SAFE_FREE(princ_s);
+   goto out;
+   }
}
 
printf(%3d  %s\t\t %s\n, kt_entry.vno, etype_s, princ_s);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 9ccd1174f75276b0533b5bbb0765df8fc1e2912d

2008-12-02 Thread Günther Deschner 
The branch, master has been updated
   via  9ccd1174f75276b0533b5bbb0765df8fc1e2912d (commit)
   via  8e5cd8f81c80feee87defe85be7de0b0ee76dfe9 (commit)
  from  25e7b21121d867a74c9e5241a8684e9937961fe3 (commit)

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


- Log -
commit 9ccd1174f75276b0533b5bbb0765df8fc1e2912d
Author: Günther Deschner [EMAIL PROTECTED]
Date:   Tue Dec 2 02:08:05 2008 +0100

s3-samr: simplify _samr_QueryUserInfo a lot and fix some few potential 
memleaks.

Guenther

commit 8e5cd8f81c80feee87defe85be7de0b0ee76dfe9
Author: Günther Deschner [EMAIL PROTECTED]
Date:   Tue Dec 2 00:58:53 2008 +0100

s3-samr: fix samr_SetUserInfo{2} level 23.

Do not just start decoding/setting passwords when fields_present
do not indicate there is a password to be set.

Guenther

---

Summary of changes:
 source3/rpc_server/srv_samr_nt.c |  241 +-
 1 files changed, 58 insertions(+), 183 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index dc2377b..cbcd4de 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2255,11 +2255,9 @@ static NTSTATUS init_samr_parameters_string(TALLOC_CTX 
*mem_ctx,
 
 static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
struct samr_UserInfo5 *r,
-   DOM_SID *user_sid,
+   struct samu *pw,
DOM_SID *domain_sid)
 {
-   struct samu *pw = NULL;
-   bool ret;
const DOM_SID *sid_user, *sid_group;
uint32_t rid, primary_gid;
NTTIME last_logon, last_logoff, last_password_change,
@@ -2271,24 +2269,6 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
 
ZERO_STRUCTP(r);
 
-   if (!(pw = samu_new(mem_ctx))) {
-   return NT_STATUS_NO_MEMORY;
-   }
-
-   become_root();
-   ret = pdb_getsampwsid(pw, user_sid);
-   unbecome_root();
-
-   if (ret == False) {
-   DEBUG(4,(User %s not found\n, sid_string_dbg(user_sid)));
-   TALLOC_FREE(pw);
-   return NT_STATUS_NO_SUCH_USER;
-   }
-
-   samr_clear_sam_passwd(pw);
-
-   DEBUG(3,(User:[%s]\n, pdb_get_username(pw)));
-
sid_user = pdb_get_user_sid(pw);
 
if (!sid_peek_check_rid(domain_sid, sid_user, rid)) {
@@ -2296,7 +2276,6 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
  the domain sid %s.  Failing operation.\n,
  pdb_get_username(pw), sid_string_dbg(sid_user),
  sid_string_dbg(domain_sid)));
-   TALLOC_FREE(pw);
return NT_STATUS_UNSUCCESSFUL;
}
 
@@ -2309,7 +2288,6 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
  which conflicts with the domain sid %s.  Failing 
operation.\n,
  pdb_get_username(pw), sid_string_dbg(sid_group),
  sid_string_dbg(domain_sid)));
-   TALLOC_FREE(pw);
return NT_STATUS_UNSUCCESSFUL;
}
 
@@ -2350,8 +2328,6 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
 acct_expiry,
 pdb_get_acct_ctrl(pw));
 
-   TALLOC_FREE(pw);
-
return NT_STATUS_OK;
 }
 
@@ -2361,35 +2337,16 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx,
struct samr_UserInfo7 *r,
-   DOM_SID *user_sid)
+   struct samu *smbpass)
 {
-   struct samu *smbpass=NULL;
-   bool ret;
const char *account_name = NULL;
 
ZERO_STRUCTP(r);
 
-   if ( !(smbpass = samu_new( mem_ctx )) ) {
-   return NT_STATUS_NO_MEMORY;
-   }
-
-   become_root();
-   ret = pdb_getsampwsid(smbpass, user_sid);
-   unbecome_root();
-
-   if ( !ret ) {
-   DEBUG(4,(User %s not found\n, sid_string_dbg(user_sid)));
-   return NT_STATUS_NO_SUCH_USER;
-   }
-
account_name = talloc_strdup(mem_ctx, pdb_get_username(smbpass));
if (!account_name) {
-   TALLOC_FREE(smbpass);
return NT_STATUS_NO_MEMORY;
}
-   TALLOC_FREE(smbpass);
-
-   DEBUG(3,(User:[%s]\n, account_name));
 
init_samr_user_info7(r, account_name);
 
@@ -2402,33 +2359,12 @@ static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx,
struct samr_UserInfo9 *r,
-   DOM_SID *user_sid)
+   struct samu *smbpass)
 {
-

[SCM] Samba Shared Repository - branch master updated - c554080dd988791ec2db37c96ff7cc709b0ee6ab

2008-12-02 Thread Günther Deschner 
The branch, master has been updated
   via  c554080dd988791ec2db37c96ff7cc709b0ee6ab (commit)
  from  ac6c003078aebee90dc5fdcd135fd13be358bab7 (commit)

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


- Log -
commit c554080dd988791ec2db37c96ff7cc709b0ee6ab
Author: Günther Deschner [EMAIL PROTECTED]
Date:   Tue Dec 2 12:57:02 2008 +0100

s3-net: allow to list a keytab generated using net rpc vampire.

Guenther

---

Summary of changes:
 source3/libads/kerberos_keytab.c |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 883f582..c4e6709 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -725,8 +725,11 @@ int ads_keytab_list(const char *keytab_name)
 
ret = smb_krb5_enctype_to_string(context, enctype, etype_s);
if (ret) {
-   SAFE_FREE(princ_s);
-   goto out;
+   if (asprintf(etype_s, UNKNOWN: %d\n, enctype) == -1)
+   {
+   SAFE_FREE(princ_s);
+   goto out;
+   }
}
 
printf(%3d  %s\t\t %s\n, kt_entry.vno, etype_s, princ_s);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - c09e04ac83365333605b7b1db3d07ccfd451a667

2008-12-02 Thread Karolin Seeger 
The branch, master has been updated
   via  c09e04ac83365333605b7b1db3d07ccfd451a667 (commit)
  from  34cfcd666354ec1a20761a90c2d28d4fe7049f6c (commit)

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


- Log -
commit c09e04ac83365333605b7b1db3d07ccfd451a667
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue Dec 2 20:50:02 2008 +0100

docs: Add default value for writeable to man smb.conf.

Karolin

---

Summary of changes:
 docs-xml/smbdotconf/security/writeable.xml |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/writeable.xml 
b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
 description
 paraInverted synonym for smbconfoption name=read only/./para
 /description
+
+value type=defaultno/value
 /samba:parameter


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4588-g70c5815

2008-12-02 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  70c581586ea02fbff4c5dde0ec002b22d472dfc5 (commit)
  from  63dbbdb33bcab7b762f308a135bb91b8dfc97757 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue Dec 2 20:50:02 2008 +0100

docs: Add default value for writeable to man smb.conf.

Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)

---

Summary of changes:
 docs-xml/smbdotconf/security/writeable.xml |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/writeable.xml 
b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
 description
 paraInverted synonym for smbconfoption name=read only/./para
 /description
+
+value type=defaultno/value
 /samba:parameter


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3221-g1ba197a

2008-12-02 Thread Karolin Seeger 
The branch, v3-2-test has been updated
   via  1ba197a3054c6d997ceca6f124039d3cabf00289 (commit)
  from  23473f3f000309ae8fa1481b4ccc97e5ee0adca1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 1ba197a3054c6d997ceca6f124039d3cabf00289
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue Dec 2 20:50:02 2008 +0100

docs: Add default value for writeable to man smb.conf.

Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)
(cherry picked from commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5)

---

Summary of changes:
 docs-xml/smbdotconf/security/writeable.xml |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/writeable.xml 
b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
 description
 paraInverted synonym for smbconfoption name=read only/./para
 /description
+
+value type=defaultno/value
 /samba:parameter


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-78-g09ccdf6

2008-12-02 Thread Karolin Seeger 
The branch, v3-0-test has been updated
   via  09ccdf6aee15169b0fe9c532ee9143bd0cff9d78 (commit)
  from  c419f129bef588f90e0a7c165dcdf8990b1bb600 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -
commit 09ccdf6aee15169b0fe9c532ee9143bd0cff9d78
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue Dec 2 20:50:02 2008 +0100

docs: Add default value for writeable to man smb.conf.

Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)
(cherry picked from commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5)
(cherry picked from commit 1ba197a3054c6d997ceca6f124039d3cabf00289)

---

Summary of changes:
 docs-xml/smbdotconf/security/writeable.xml |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/writeable.xml 
b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
 description
 paraInverted synonym for smbconfoption name=read only/./para
 /description
+
+value type=defaultno/value
 /samba:parameter


-- 
Samba Shared Repository

Re: [SCM] Samba Shared Repository - branch master updated - ac6c003078aebee90dc5fdcd135fd13be358bab7

2008-12-02 Thread Jeremy Allison 
On Tue, Dec 02, 2008 at 03:28:56AM -0600, Kai Blin wrote:
 The branch, master has been updated
via  ac6c003078aebee90dc5fdcd135fd13be358bab7 (commit)
   from  9ccd1174f75276b0533b5bbb0765df8fc1e2912d (commit)
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
 - Log -
 commit ac6c003078aebee90dc5fdcd135fd13be358bab7
 Author: Kai Blin [EMAIL PROTECTED]
 Date:   Tue Dec 2 10:26:42 2008 +0100
 
 configure.in: Fix smbtorture_s3 tests.
 
 Seems like Jeremy forgot to fix configure.in when importing d448132 to 
 master
 in 8d674e35. Generate the vfs_streams_depot module so make test works 
 again.

Thanks for catching this. It wasn't in the patchset that Metze
generated so it wasn't a matter of forgetting :-). I assumed
there was a mismatch between code in s3 and master so was waiting
for that to clear up. I'd have caught that one today :-). But
thanks for the fix !

Jeremy.

Build status as of Wed Dec 3 00:00:02 2008

2008-12-02 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2008-12-02 
00:00:17.0 +
+++ /home/build/master/cache/broken_results.txt 2008-12-03 00:00:32.0 
+
@@ -1,23 +1,23 @@
-Build status as of Tue Dec  2 00:00:01 2008
+Build status as of Wed Dec  3 00:00:02 2008
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   30 7  0 
+ccache   29 7  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  30 30 0 
-libreplace   29 10 0 
-lorikeet-heimdal 27 18 0 
-pidl 18 2  0 
-ppp  13 0  0 
-rsync30 11 0 
+ldb  28 29 0 
+libreplace   26 10 0 
+lorikeet-heimdal 26 18 0 
+pidl 17 2  0 
+ppp  12 0  0 
+rsync29 11 0 
 samba-docs   0  0  0 
-samba-gtk5  5  0 
-samba_3_X_devel 28 23 5 
-samba_3_X_test 28 20 0 
-samba_4_0_test 29 28 1 
-smb-build28 7  0 
-talloc   30 30 0 
-tdb  28 9  0 
+samba-gtk4  5  0 
+samba_3_X_devel 27 20 1 
+samba_3_X_test 27 19 0 
+samba_4_0_test 26 26 1 
+smb-build27 6  0 
+talloc   29 29 0 
+tdb  27 9  0

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4589-g56a7b90

2008-12-02 Thread Jeremy Allison 
The branch, v3-3-test has been updated
   via  56a7b902765b5b4bf76d95c4e6e66ad89920a7bf (commit)
  from  70c581586ea02fbff4c5dde0ec002b22d472dfc5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 56a7b902765b5b4bf76d95c4e6e66ad89920a7bf
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue Dec 2 16:08:49 2008 -0800

configure.in: Fix smbtorture_s3 tests.

Seems like Jeremy forgot to fix configure.in when importing d448132 to 
master
in 8d674e35. Generate the vfs_streams_depot module so make test works again.

---

Summary of changes:
 source/configure.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 49732b6..798a0f8 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -409,7 +409,7 @@ dnl These have to be built static:
 default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr 
rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs2 
rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix 
auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template
 
 dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit 
vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap 
vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 
auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_acl_xattr 
vfs_acl_tdb vfs_smb_traffic_analyzer
+default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit 
vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap 
vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 
auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot 
vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer
 
 if test x$developer = xyes; then
default_static_modules=$default_static_modules rpc_rpcecho


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 85b8cccab072bab263061654b677bc84826646c9

2008-12-02 Thread Steven Danneman 
The branch, master has been updated
   via  85b8cccab072bab263061654b677bc84826646c9 (commit)
   via  239f815e30a4e5f64112a8da6401614eb3218eb5 (commit)
  from  c09e04ac83365333605b7b1db3d07ccfd451a667 (commit)

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


- Log -
commit 85b8cccab072bab263061654b677bc84826646c9
Author: Steven Danneman [EMAIL PROTECTED]
Date:   Tue Dec 2 20:15:34 2008 -0800

Add support for OneFS ACLs

Add to the OneFS VFS module, support for NTFS ACLs through the calls:

SMB_VFS_FGET_NT_ACL()
SMB_VFS_GET_NT_ACL()
SMB_VFS_FSET_NT_ACL()

Also create several new onefs specific smb.conf parameters in onefs.h

commit 239f815e30a4e5f64112a8da6401614eb3218eb5
Author: Tim Prouty [EMAIL PROTECTED]
Date:   Thu Oct 23 20:49:55 2008 -0700

Add OneFS VFS module skeleton.

Also set configure to autodetect OneFS OS and build this VFS module.

---

Summary of changes:
 source3/Makefile.in |5 +
 source3/configure.in|   19 +
 source3/modules/onefs.h |   52 +++
 source3/modules/onefs_acl.c |  807 +++
 source3/modules/vfs_onefs.c |   48 +++
 5 files changed, 931 insertions(+), 0 deletions(-)
 create mode 100644 source3/modules/onefs.h
 create mode 100644 source3/modules/onefs_acl.c
 create mode 100644 source3/modules/vfs_onefs.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 37c48d4..83e94a4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -650,6 +650,7 @@ VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
 VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
 VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
 VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
+VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o
 
 PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
 
@@ -2479,6 +2480,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) 
$(VFS_ACL_TDB_OBJ)
@echo Building plugin $@
@$(SHLD_MODULE) $(VFS_ACL_TDB_OBJ)
 
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFS_ONEFS_OBJ)
+   @echo Building plugin $@
+   @$(SHLD_MODULE) $(VFS_ONEFS_OBJ) @ONEFS_LIBS@
+
 bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) libgpo/gpext/registry.o
@echo Building plugin $@
@$(SHLD_MODULE) libgpo/gpext/registry.o
diff --git a/source3/configure.in b/source3/configure.in
index 79bd63d..40e78e8 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1052,6 +1052,24 @@ if test x$samba_cv_HAVE_GPFS = xyes; then
 fi
 LIBS=$save_LIBS
 
+#
+# check if building on Isilon OneFS
+printf %s checking for Isilon OneFS... 
+save_LIBS=$LIBS
+LIBS=$LIBS -lisi_version
+AC_TRY_LINK([#include isi_version/isi_version.h],
+  [get_isilon_copyright()],
+  samba_cv_HAVE_ONEFS=yes,
+  samba_cv_HAVE_ONEFS=no)
+echo $samba_cv_HAVE_ONEFS
+if test x$samba_cv_HAVE_ONEFS = xyes; then
+AC_DEFINE(HAVE_ONEFS,1,[Whether building on Isilon OneFS])
+default_shared_modules=$default_shared_modules vfs_onefs
+ONEFS_LIBS=-lisi_acl
+fi
+AC_SUBST(ONEFS_LIBS)
+LIBS=$save_LIBS
+
 # Note that all the libunwind symbols in the API are defined to internal
 # platform-specific version, so we must include libunwind.h before checking
 # any of them.
@@ -6127,6 +6145,7 @@ SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), 
bin/notify_fam.$SHLIBEXT, V
 SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), bin/acl_xattr.$SHLIBEXT, 
VFS)
 SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), bin/acl_tdb.$SHLIBEXT, VFS)
 SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), 
bin/smb_traffic_analyzer.$SHLIBEXT, VFS)
+SMB_MODULE(vfs_onefs, \$(VFS_ONEFS), bin/onefs.$SHLIBEXT, VFS)
 
 SMB_SUBSYSTEM(VFS,smbd/vfs.o)
 
diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
new file mode 100644
index 000..965f395
--- /dev/null
+++ b/source3/modules/onefs.h
@@ -0,0 +1,52 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Support for OneFS
+ *
+ * Copyright (C) Steven Danneman, 2008
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef _ONEFS_H
+#define _ONEFS_H
+
+/* OneFS Module smb.conf parameters and defaults */
+
+/**
+* Specifies when ACLs