Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.

2007-05-31 Thread Stefan (metze) Metzmacher 
 Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c
 ===
 --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c2007-05-29 17:10:36
 -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
 const char *name, uint32 security_info_sent, struct
 security_descriptor_info *psd)
 +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
 const char *name, uint32 security_info_sent, struct security_descriptor
 *psd)

I think we need to increase the VFS interface version for
3.0.26

metze

Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.

2007-05-31 Thread Jeremy Allison 
On Thu, May 31, 2007 at 08:23:08AM +0200, Stefan (metze) Metzmacher wrote:
  Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c
  ===
  --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c  2007-05-29 17:10:36
  -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
  const char *name, uint32 security_info_sent, struct
  security_descriptor_info *psd)
  +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
  const char *name, uint32 security_info_sent, struct security_descriptor
  *psd)
 
 I think we need to increase the VFS interface version for
 3.0.26

I thouhgt I already did that when adding LCHOWN ?

Jeremy.

Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.

2007-05-31 Thread Jeremy Allison 
On Wed, May 30, 2007 at 11:34:30PM -0700, Jeremy Allison wrote:
 On Thu, May 31, 2007 at 08:23:08AM +0200, Stefan (metze) Metzmacher wrote:
   Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c
   ===
   --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c2007-05-29 
   17:10:36
   -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
   const char *name, uint32 security_info_sent, struct
   security_descriptor_info *psd)
   +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
   const char *name, uint32 security_info_sent, struct security_descriptor
   *psd)
  
  I think we need to increase the VFS interface version for
  3.0.26
 
 I thouhgt I already did that when adding LCHOWN ?

Yep - just checked. It's 21 for 3.0.25 and 22 for 3.0.26.

Jeremy.

svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules: .

2007-05-29 Thread jerry 
Author: jerry
Date: 2007-05-29 17:12:08 + (Tue, 29 May 2007)
New Revision: 23215

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23215

Log:
missed merged for sec_desc changes
Modified:
   branches/SAMBA_3_0_26/source/modules/vfs_cap.c


Changeset:
Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c
===
--- branches/SAMBA_3_0_26/source/modules/vfs_cap.c  2007-05-29 17:10:36 UTC 
(rev 23214)
+++ branches/SAMBA_3_0_26/source/modules/vfs_cap.c  2007-05-29 17:12:08 UTC 
(rev 23215)
@@ -184,7 +184,7 @@
return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
 }
 
-static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const 
char *name, uint32 security_info_sent, struct security_descriptor_info *psd)
+static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const 
char *name, uint32 security_info_sent, struct security_descriptor *psd)
 {
 pstring capname;
capencode(capname, name);