A small patch for C++ VFS modules.

[Alexander Bokovoy]

On Thu, Jun 23, 2005 at 05:15:52PM +1000, Ben Martin wrote:
> OK patch attached this time :/
Could you make it against current SVN for SAMBA_3_0? There were changes,
particulary in popt and VFS support which clutter your patch: 

> diff -Nuar samba-3.0.10-vanilla/source/include/vfs.h samba-3.0.10/source/include/vfs.h
> --- samba-3.0.10-vanilla/source/include/vfs.h	2004-10-26 07:05:06.000000000 +1000
> +++ samba-3.0.10/source/include/vfs.h	2005-06-11 15:55:18.468163000 +1000
> @@ -224,7 +224,7 @@
>  		ssize_t (*pwrite)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, const void *data, size_t n, SMB_OFF_T offset);
>  		SMB_OFF_T (*lseek)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_OFF_T offset, int whence);
>  		ssize_t (*sendfile)(struct vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, size_t count);
> -		int (*rename)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *old, const char *new);
> +		int (*rename)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *old, const char *new_str /*MIQ*/ );
>  		int (*fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd);
>  		int (*stat)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *fname, SMB_STRUCT_STAT *sbuf);
>  		int (*fstat)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_STAT *sbuf);
Any change in VFS layer require increasing VFS version number.

And following part is autogenerated file and should not be in the patch:
> diff -Nuar samba-3.0.10-vanilla/source/utils/ntlm_auth_proto.h samba-3.0.10/source/utils/ntlm_auth_proto.h
> --- samba-3.0.10-vanilla/source/utils/ntlm_auth_proto.h	1970-01-01 10:00:00.000000000 +1000
> +++ samba-3.0.10/source/utils/ntlm_auth_proto.h	2005-06-11 15:49:24.733939000 +1000
> @@ -0,0 +1,28 @@
> +#ifndef _NTLM_AUTH_PROTO_H_
> +#define _NTLM_AUTH_PROTO_H_
> +
> +/* This file is automatically generated with "make proto". DO NOT EDIT */
> +
> +
> +/* The following definitions come from utils/ntlm_auth.c  */
> +
> +const char *get_winbind_domain(void);
> +const char *get_winbind_netbios_name(void);
> +DATA_BLOB get_challenge(void) ;
> +NTSTATUS contact_winbind_auth_crap(const char *username, 
> +				   const char *domain, 
> +				   const char *workstation,
> +				   const DATA_BLOB *challenge, 
> +				   const DATA_BLOB *lm_response, 
> +				   const DATA_BLOB *nt_response, 
> +				   uint32 flags, 
> +				   uint8 lm_key[8], 
> +				   uint8 user_session_key[16], 
> +				   char **error_string, 
> +				   char **unix_name) ;
> +
> +/* The following definitions come from utils/ntlm_auth_diagnostics.c  */
> +
> +BOOL diagnose_ntlm_auth(void);
> +
> +#endif /*  _NTLM_AUTH_PROTO_H_  */




-- 
/ Alexander Bokovoy
Samba Team                      http://www.samba.org/
ALT Linux Team                  http://www.altlinux.org/
Midgard Project Ry              http://www.midgard-project.org/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20050623/d9b24ff7/attachment.bin