summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-08-17 14:15:33 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-08-17 14:15:33 +0000
commit21d26afb2af6ae34219a4286eb7a8896d7e04a3a (patch)
treeb114286c87c513c83a66104591bbdee5520608c8 /examples
parent592dd249579511f7ce863a42030d9a51ca026c27 (diff)
downloadsamba-21d26afb2af6ae34219a4286eb7a8896d7e04a3a.tar.gz
samba-21d26afb2af6ae34219a4286eb7a8896d7e04a3a.tar.bz2
samba-21d26afb2af6ae34219a4286eb7a8896d7e04a3a.zip
sync 3_0 branch with HEAD
(This used to be commit 19ab776bf9c91cf4e56887fd7a63d3253b7e36ef)
Diffstat (limited to 'examples')
-rw-r--r--examples/LDAP/samba.schema16
-rw-r--r--examples/VFS/audit.c174
-rw-r--r--examples/VFS/block/block.c144
-rw-r--r--examples/VFS/recycle.c139
-rw-r--r--examples/VFS/skel.c243
-rw-r--r--examples/pdb/README4
-rw-r--r--examples/pdb/pdb_test.c8
7 files changed, 248 insertions, 480 deletions
diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index be088c7403..61dface0a2 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -119,8 +119,20 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID'
# MUST ( uid $ uidNumber )
# MAY ( lmPassword $ ntPassword $ pwdLastSet $ acctFlags ))
-objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
- DESC 'Samba Account'
+#objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
+# DESC 'Samba Account'
+# MUST ( uid $ rid )
+# MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
+# logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
+# displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
+# description $ userWorkstations $ primaryGroupID $ domain ))
+
+## The X.500 data model (and therefore LDAPv3) says that each entry can
+## only have one structural objectclass. OpenLDAP 2.0 does not enforce
+## this currently but will in v2.1
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY
+ DESC 'Samba Auxilary Account'
MUST ( uid $ rid )
MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
diff --git a/examples/VFS/audit.c b/examples/VFS/audit.c
index aad483c295..92b78c1c32 100644
--- a/examples/VFS/audit.c
+++ b/examples/VFS/audit.c
@@ -3,6 +3,7 @@
* facility.
*
* Copyright (C) Tim Potter, 1999-2000
+ * Copyright (C) Alexander Bokovoy, 2002
*
* 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
@@ -47,134 +48,79 @@
/* Function prototypes */
-int audit_connect(struct connection_struct *conn, const char *svc, const char *user);
-void audit_disconnect(struct connection_struct *conn);
-DIR *audit_opendir(struct connection_struct *conn, const char *fname);
-int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode);
-int audit_rmdir(struct connection_struct *conn, const char *path);
-int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode);
-int audit_close(struct files_struct *fsp, int fd);
-int audit_rename(struct connection_struct *conn, const char *old, const char *new);
-int audit_unlink(struct connection_struct *conn, const char *path);
-int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode);
-int audit_chmod_acl(struct connection_struct *conn, const char *name, mode_t mode);
-int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode);
-int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode);
+static int audit_connect(struct connection_struct *conn, const char *svc, const char *user);
+static void audit_disconnect(struct connection_struct *conn);
+static DIR *audit_opendir(struct connection_struct *conn, const char *fname);
+static int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode);
+static int audit_rmdir(struct connection_struct *conn, const char *path);
+static int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode);
+static int audit_close(struct files_struct *fsp, int fd);
+static int audit_rename(struct connection_struct *conn, const char *old, const char *new);
+static int audit_unlink(struct connection_struct *conn, const char *path);
+static int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode);
+static int audit_chmod_acl(struct connection_struct *conn, const char *name, mode_t mode);
+static int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode);
+static int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode);
/* VFS operations */
-extern struct vfs_ops default_vfs_ops; /* For passthrough operation */
+static struct vfs_ops default_vfs_ops; /* For passthrough operation */
+static struct smb_vfs_handle_struct *audit_handle;
-struct vfs_ops audit_ops = {
+static vfs_op_tuple audit_ops[] = {
/* Disk operations */
- audit_connect,
- audit_disconnect,
- NULL, /* disk free */
+ {audit_connect, SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_LOGGER},
+ {audit_disconnect, SMB_VFS_OP_DISCONNECT, SMB_VFS_LAYER_LOGGER},
/* Directory operations */
- audit_opendir,
- NULL, /* readdir */
- audit_mkdir,
- audit_rmdir,
- NULL, /* closedir */
+ {audit_opendir, SMB_VFS_OP_OPENDIR, SMB_VFS_LAYER_LOGGER},
+ {audit_mkdir, SMB_VFS_OP_MKDIR, SMB_VFS_LAYER_LOGGER},
+ {audit_rmdir, SMB_VFS_OP_RMDIR, SMB_VFS_LAYER_LOGGER},
/* File operations */
- audit_open,
- audit_close,
- NULL, /* read */
- NULL, /* write */
- NULL, /* lseek */
- audit_rename,
- NULL, /* fsync */
- NULL, /* stat */
- NULL, /* fstat */
- NULL, /* lstat */
- audit_unlink,
- audit_chmod,
- audit_fchmod,
- NULL, /* chown */
- NULL, /* fchown */
- NULL, /* chdir */
- NULL, /* getwd */
- NULL, /* utime */
- NULL, /* ftruncate */
- NULL, /* lock */
- NULL, /* symlink */
- NULL, /* readlink */
- NULL, /* link */
- NULL, /* mknod */
- NULL, /* realpath */
- NULL, /* fget_nt_acl */
- NULL, /* get_nt_acl */
- NULL, /* fset_nt_acl */
- NULL, /* set_nt_acl */
-
- audit_chmod_acl, /* chmod_acl */
- audit_fchmod_acl, /* fchmod_acl */
-
- NULL, /* sys_acl_get_entry */
- NULL, /* sys_acl_get_tag_type */
- NULL, /* sys_acl_get_permset */
- NULL, /*sys_acl_get_qualifier */
- NULL, /* sys_acl_get_file */
- NULL, /* sys_acl_get_fd */
- NULL, /* sys_acl_clear_perms */
- NULL, /* sys_acl_add_perm */
- NULL, /* sys_acl_to_text */
- NULL, /* sys_acl_init */
- NULL, /* sys_acl_create_entry */
- NULL, /* sys_acl_set_tag_type */
- NULL, /* sys_acl_set_qualifier */
- NULL, /* sys_acl_set_permset */
- NULL, /* sys_acl_valid */
- NULL, /* sys_acl_set_file */
- NULL, /* sys_acl_set_fd */
- NULL, /* sys_acl_delete_def_file */
- NULL, /* sys_acl_get_perm */
- NULL, /* sys_acl_free_text */
- NULL, /* sys_acl_free_acl */
- NULL /* sys_acl_free_qualifier */
+ {audit_open, SMB_VFS_OP_OPEN, SMB_VFS_LAYER_LOGGER},
+ {audit_close, SMB_VFS_OP_CLOSE, SMB_VFS_LAYER_LOGGER},
+ {audit_rename, SMB_VFS_OP_RENAME, SMB_VFS_LAYER_LOGGER},
+ {audit_unlink, SMB_VFS_OP_UNLINK, SMB_VFS_LAYER_LOGGER},
+ {audit_chmod, SMB_VFS_OP_CHMOD, SMB_VFS_LAYER_LOGGER},
+ {audit_fchmod, SMB_VFS_OP_FCHMOD, SMB_VFS_LAYER_LOGGER},
+ {audit_chmod_acl, SMB_VFS_OP_CHMOD_ACL, SMB_VFS_LAYER_LOGGER},
+ {audit_fchmod_acl, SMB_VFS_OP_FCHMOD_ACL, SMB_VFS_LAYER_LOGGER},
+
+ /* Finish VFS operations definition */
+
+ {NULL, SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
-/* VFS initialisation function. Return initialised vfs_ops structure
- back to SAMBA. */
+/* VFS initialisation function. Return vfs_op_tuple array back to SAMBA. */
-struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
+vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
+ struct smb_vfs_handle_struct *vfs_handle)
{
- struct vfs_ops tmp_ops;
-
*vfs_version = SMB_VFS_INTERFACE_VERSION;
- memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
-
- tmp_ops.connect = audit_connect;
- tmp_ops.disconnect = audit_disconnect;
- tmp_ops.opendir = audit_opendir;
- tmp_ops.mkdir = audit_mkdir;
- tmp_ops.rmdir = audit_rmdir;
- tmp_ops.open = audit_open;
- tmp_ops.close = audit_close;
- tmp_ops.rename = audit_rename;
- tmp_ops.unlink = audit_unlink;
- tmp_ops.chmod = audit_chmod;
- tmp_ops.chmod_acl = audit_chmod_acl;
- tmp_ops.fchmod = audit_fchmod;
- tmp_ops.fchmod_acl = audit_fchmod_acl;
-
- memcpy(&audit_ops, &tmp_ops, sizeof(struct vfs_ops));
+ memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
+
+ audit_handle = vfs_handle;
openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY);
syslog(SYSLOG_PRIORITY, "VFS_INIT: vfs_ops loaded\n");
- return &audit_ops;
+ return audit_ops;
+}
+
+/* VFS finalization function. */
+void vfs_done(connection_struct *conn)
+{
+ syslog(SYSLOG_PRIORITY, "VFS_DONE: vfs module unloaded\n");
}
/* Implementation of vfs_ops. Pass everything on to the default
operation but log event first. */
-int audit_connect(struct connection_struct *conn, const char *svc, const char *user)
+static int audit_connect(struct connection_struct *conn, const char *svc, const char *user)
{
syslog(SYSLOG_PRIORITY, "connect to service %s by user %s\n",
svc, user);
@@ -182,13 +128,13 @@ int audit_connect(struct connection_struct *conn, const char *svc, const char *u
return default_vfs_ops.connect(conn, svc, user);
}
-void audit_disconnect(struct connection_struct *conn)
+static void audit_disconnect(struct connection_struct *conn)
{
syslog(SYSLOG_PRIORITY, "disconnected\n");
default_vfs_ops.disconnect(conn);
}
-DIR *audit_opendir(struct connection_struct *conn, const char *fname)
+static DIR *audit_opendir(struct connection_struct *conn, const char *fname)
{
DIR *result = default_vfs_ops.opendir(conn, fname);
@@ -200,7 +146,7 @@ DIR *audit_opendir(struct connection_struct *conn, const char *fname)
return result;
}
-int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode)
+static int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode)
{
int result = default_vfs_ops.mkdir(conn, path, mode);
@@ -212,7 +158,7 @@ int audit_mkdir(struct connection_struct *conn, const char *path, mode_t mode)
return result;
}
-int audit_rmdir(struct connection_struct *conn, const char *path)
+static int audit_rmdir(struct connection_struct *conn, const char *path)
{
int result = default_vfs_ops.rmdir(conn, path);
@@ -224,7 +170,7 @@ int audit_rmdir(struct connection_struct *conn, const char *path)
return result;
}
-int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
+static int audit_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
{
int result = default_vfs_ops.open(conn, fname, flags, mode);
@@ -237,7 +183,7 @@ int audit_open(struct connection_struct *conn, const char *fname, int flags, mod
return result;
}
-int audit_close(struct files_struct *fsp, int fd)
+static int audit_close(struct files_struct *fsp, int fd)
{
int result = default_vfs_ops.close(fsp, fd);
@@ -249,7 +195,7 @@ int audit_close(struct files_struct *fsp, int fd)
return result;
}
-int audit_rename(struct connection_struct *conn, const char *old, const char *new)
+static int audit_rename(struct connection_struct *conn, const char *old, const char *new)
{
int result = default_vfs_ops.rename(conn, old, new);
@@ -261,7 +207,7 @@ int audit_rename(struct connection_struct *conn, const char *old, const char *ne
return result;
}
-int audit_unlink(struct connection_struct *conn, const char *path)
+static int audit_unlink(struct connection_struct *conn, const char *path)
{
int result = default_vfs_ops.unlink(conn, path);
@@ -273,7 +219,7 @@ int audit_unlink(struct connection_struct *conn, const char *path)
return result;
}
-int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode)
+static int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode)
{
int result = default_vfs_ops.chmod(conn, path, mode);
@@ -285,7 +231,7 @@ int audit_chmod(struct connection_struct *conn, const char *path, mode_t mode)
return result;
}
-int audit_chmod_acl(struct connection_struct *conn, const char *path, mode_t mode)
+static int audit_chmod_acl(struct connection_struct *conn, const char *path, mode_t mode)
{
int result = default_vfs_ops.chmod_acl(conn, path, mode);
@@ -297,7 +243,7 @@ int audit_chmod_acl(struct connection_struct *conn, const char *path, mode_t mod
return result;
}
-int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode)
+static int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode)
{
int result = default_vfs_ops.fchmod(fsp, fd, mode);
@@ -309,7 +255,7 @@ int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode)
return result;
}
-int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
+static int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
{
int result = default_vfs_ops.fchmod_acl(fsp, fd, mode);
diff --git a/examples/VFS/block/block.c b/examples/VFS/block/block.c
index f83ab6e07e..9478b75f0f 100644
--- a/examples/VFS/block/block.c
+++ b/examples/VFS/block/block.c
@@ -3,6 +3,7 @@
* Block access from links to dev mount points specified in PARAMCONF file
*
* Copyright (C) Ronald Kuetemeier, 2001
+ * Copyright (C) Alexander Bokovoy, 2002
*
* 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
@@ -47,93 +48,29 @@
-DIR *block_opendir(struct connection_struct *conn, char *fname);
-int block_connect(struct connection_struct *conn, const char *service, const char *user);
-void block_disconnect(struct connection_struct *conn);
+static DIR *block_opendir(connection_struct *conn, char *fname);
+static int block_connect(connection_struct *conn, const char *service, const char *user);
+static void block_disconnect(connection_struct *conn);
+static struct smb_vfs_handle_struct *block_handle;
/* VFS operations */
-extern struct vfs_ops default_vfs_ops; /* For passthrough operation */
+static struct vfs_ops default_vfs_ops; /* For passthrough operation */
-struct vfs_ops execute_vfs_ops = {
+static vfs_op_tuple block_vfs_ops[] = {
/* Disk operations */
- block_connect,
- block_disconnect,
- NULL, /* disk free */
+ {block_connect, SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_TRANSPARENT},
+ {block_disconnect, SMB_VFS_OP_DISCONNECT, SMB_VFS_LAYER_TRANSPARENT},
/* Directory operations */
- block_opendir,
- NULL, /* readdir */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* closedir */
-
- /* File operations */
-
- NULL, /* open */
- NULL, /* close */
- NULL, /* read */
- NULL, /* write */
- NULL, /* lseek */
- NULL, /* rename */
- NULL, /* fsync */
- NULL, /* stat */
- NULL, /* fstat */
- NULL, /* lstat */
- NULL, /* unlink */
- NULL, /* chmod */
- NULL, /* fchmod */
- NULL, /* chown */
- NULL, /* fchown */
- NULL, /* chdir */
- NULL, /* getwd */
- NULL, /* utime */
- NULL, /* ftruncate */
- NULL, /* lock */
- NULL, /* symlink */
- NULL, /* readlink */
- NULL, /* link */
- NULL, /* mknod */
- NULL, /* realpath */
-
- /* NT ACL operations */
-
- NULL, /* fget_nt_acl */
- NULL, /* get_nt_acl */
- NULL, /* fset_nt_acl */
- NULL, /* set_nt_acl */
-
- /* POSIX ACL operations. */
-
- NULL, /* chmod_acl */
- NULL, /* fchmod_acl */
- NULL, /* sys_acl_get_entry */
- NULL, /* sys_acl_get_tag_type */
- NULL, /* sys_acl_get_permset */
- NULL, /* sys_acl_get_qualifier */
- NULL, /* sys_acl_get_file */
- NULL, /* sys_acl_get_fd */
- NULL, /* sys_acl_clear_perms */
- NULL, /* sys_acl_add_perm */
- NULL, /* sys_acl_to_text */
- NULL, /* sys_acl_init */
- NULL, /* sys_acl_create_entry */
- NULL, /* sys_acl_set_tag_type */
- NULL, /* sys_acl_set_qualifier */
- NULL, /* sys_acl_set_permset */
- NULL, /* sys_acl_valid */
- NULL, /* sys_acl_set_file */
- NULL, /* sys_acl_set_fd */
- NULL, /* sys_acl_delete_def_file */
- NULL, /* sys_acl_get_perm */
- NULL, /* sys_acl_free_text */
- NULL, /* sys_acl_free_acl */
- NULL /* sys_acl_free_qualifier */
+ {block_opendir, SMB_VFS_OP_OPENDIR, SMB_VFS_LAYER_TRANSPARENT},
+
+ {NULL, SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
@@ -145,13 +82,13 @@ extern BOOL pm_process(char *FileName, BOOL (*sfunc)(char *), BOOL(*pfunc)(char
//functions
-BOOL enter_pblock_mount(char *dir);
-BOOL get_section(char *sect);
-BOOL get_parameter_value(char *param, char *value);
-BOOL load_param(void);
-BOOL search(struct stat *stat_buf);
-BOOL dir_search(char *link, char *dir);
-BOOL enter_pblock_dir(char *dir);
+static BOOL enter_pblock_mount(char *dir);
+static BOOL get_section(char *sect);
+static BOOL get_parameter_value(char *param, char *value);
+static BOOL load_param(void);
+static BOOL search(struct stat *stat_buf);
+static BOOL dir_search(char *link, char *dir);
+static BOOL enter_pblock_dir(char *dir);
@@ -176,7 +113,7 @@ static struct block_dir *pblock_dir = NULL;
* Load the conf file into a table
*/
-BOOL load_param(void)
+static BOOL load_param(void)
{
if ((pm_process(PARAMCONF,&get_section,&get_parameter_value)) == TRUE)
@@ -194,7 +131,7 @@ BOOL load_param(void)
*
*/
-BOOL enter_pblock_mount(char *dir)
+static BOOL enter_pblock_mount(char *dir)
{
struct stat stat_buf;
static struct block_dir *tmp_pblock;
@@ -242,7 +179,7 @@ BOOL enter_pblock_mount(char *dir)
*
*/
-BOOL enter_pblock_dir(char *dir)
+static BOOL enter_pblock_dir(char *dir)
{
static struct block_dir *tmp_pblock;
@@ -285,7 +222,7 @@ BOOL enter_pblock_dir(char *dir)
* Function callback for config section names
*/
-BOOL get_section(char *sect)
+static BOOL get_section(char *sect)
{
return TRUE;
}
@@ -297,7 +234,7 @@ BOOL get_section(char *sect)
*
*/
-BOOL get_parameter_value(char *param, char *value)
+static BOOL get_parameter_value(char *param, char *value)
{
int i = 0, maxargs = sizeof(params) / sizeof(char *);
@@ -327,24 +264,25 @@ BOOL get_parameter_value(char *param, char *value)
-/* VFS initialisation function. Return initialised vfs_ops structure
+/* VFS initialisation function. Return initialised vfs_op_tuple array
back to SAMBA. */
-struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
+vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
+ struct smb_vfs_handle_struct *vfs_handle)
{
- struct vfs_ops tmp_ops;
-
*vfs_version = SMB_VFS_INTERFACE_VERSION;
- memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
+ memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
+
+ block_handle = vfs_handle;
+
+ return block_vfs_ops;
+}
- /* Override the ones we want. */
- tmp_ops.connect = block_connect;
- tmp_ops.disconnect = block_disconnect;
- tmp_ops.opendir = block_opendir;
- memcpy(&execute_vfs_ops, &tmp_ops, sizeof(struct vfs_ops));
- return(&execute_vfs_ops);
+/* VFS finalization function. */
+void vfs_done(connection_struct *conn)
+{
}
@@ -352,7 +290,7 @@ struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
* VFS connect and param file loading
*/
-int block_connect(struct connection_struct *conn, char *service, char *user)
+static int block_connect(connection_struct *conn, const char *service, const char *user)
{
if((load_param()) == FALSE)
{
@@ -372,7 +310,7 @@ int block_connect(struct connection_struct *conn, char *service, char *user)
*/
-void block_disconnect(struct connection_struct *conn)
+static void block_disconnect(struct connection_struct *conn)
{
struct block_dir *tmp_pblock = (pblock_mountp == NULL ? pblock_dir : pblock_mountp);
@@ -403,7 +341,7 @@ void block_disconnect(struct connection_struct *conn)
* VFS opendir
*/
-DIR *block_opendir(struct connection_struct *conn, char *fname)
+static DIR *block_opendir(struct connection_struct *conn, char *fname)
{
char *dir_name = NULL;
@@ -437,7 +375,7 @@ DIR *block_opendir(struct connection_struct *conn, char *fname)
* Find mount point to block in list
*/
-BOOL search(struct stat *stat_buf)
+static BOOL search(struct stat *stat_buf)
{
struct block_dir *tmp_pblock = pblock_mountp;
@@ -459,7 +397,7 @@ BOOL search(struct stat *stat_buf)
* Find dir in list to block id the starting point is link from a share
*/
-BOOL dir_search(char *link, char *dir)
+static BOOL dir_search(char *link, char *dir)
{
char buf[PATH_MAX +1], *ext_path;
int len = 0;
diff --git a/examples/VFS/recycle.c b/examples/VFS/recycle.c
index 6a1c98ce54..ed89e59abf 100644
--- a/examples/VFS/recycle.c
+++ b/examples/VFS/recycle.c
@@ -4,6 +4,7 @@
*
* Copyright (C) 2001, Brandon Stone, Amherst College, <bbstone@amherst.edu>.
* Copyright (C) 2002, Jeremy Allison - modified to make a VFS module.
+ * Copyright (C) 2002, Alexander Bokovoy - cascaded VFS adoption,
*
* 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
@@ -40,139 +41,67 @@
/* VFS operations */
-extern struct vfs_ops default_vfs_ops; /* For passthrough operation */
-
+static struct vfs_ops default_vfs_ops; /* For passthrough operation */
+static struct smb_vfs_handle_struct *recycle_handle;
static int recycle_unlink(connection_struct *, const char *);
static int recycle_connect(struct connection_struct *conn, const char *service, const char *user);
static void recycle_disconnect(struct connection_struct *conn);
-struct vfs_ops recycle_ops = {
-
- /* Disk operations */
-
- recycle_connect, /* connect */
- recycle_disconnect, /* disconnect */
- NULL, /* disk free */
+static vfs_op_tuple recycle_ops[] = {
- /* Directory operations */
+ /* Disk operations */
- NULL, /* opendir */
- NULL, /* readdir */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* closedir */
+ {recycle_connect, SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_OPAQUE},
+ {recycle_disconnect, SMB_VFS_OP_DISCONNECT, SMB_VFS_LAYER_OPAQUE},
/* File operations */
-
- NULL, /* open */
- NULL, /* close */
- NULL, /* read */
- NULL, /* write */
- NULL, /* lseek */
- NULL, /* rename */
- NULL, /* fsync */
- NULL, /* stat */
- NULL, /* fstat */
- NULL, /* lstat */
- recycle_unlink,
- NULL, /* chmod */
- NULL, /* fchmod */
- NULL, /* chown */
- NULL, /* fchown */
- NULL, /* chdir */
- NULL, /* getwd */
- NULL, /* utime */
- NULL, /* ftruncate */
- NULL, /* lock */
- NULL, /* symlink */
- NULL, /* readlink */
- NULL, /* link */
- NULL, /* mknod */
- NULL, /* realpath */
- NULL, /* fget_nt_acl */
- NULL, /* get_nt_acl */
- NULL, /* fset_nt_acl */
- NULL, /* set_nt_acl */
-
- NULL, /* chmod_acl */
- NULL, /* fchmod_acl */
-
- NULL, /* sys_acl_get_entry */
- NULL, /* sys_acl_get_tag_type */
- NULL, /* sys_acl_get_permset */
- NULL, /* sys_acl_get_qualifier */
- NULL, /* sys_acl_get_file */
- NULL, /* sys_acl_get_fd */
- NULL, /* sys_acl_clear_perms */
- NULL, /* sys_acl_add_perm */
- NULL, /* sys_acl_to_text */
- NULL, /* sys_acl_init */
- NULL, /* sys_acl_create_entry */
- NULL, /* sys_acl_set_tag_type */
- NULL, /* sys_acl_set_qualifier */
- NULL, /* sys_acl_set_permset */
- NULL, /* sys_acl_valid */
- NULL, /* sys_acl_set_file */
- NULL, /* sys_acl_set_fd */
- NULL, /* sys_acl_delete_def_file */
- NULL, /* sys_acl_get_perm */
- NULL, /* sys_acl_free_text */
- NULL, /* sys_acl_free_acl */
- NULL /* sys_acl_free_qualifier */
+
+ {recycle_unlink, SMB_VFS_OP_UNLINK, SMB_VFS_LAYER_OPAQUE},
+
+ {NULL, SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
-/* VFS initialisation function. Return initialised vfs_ops structure
- back to SAMBA. */
+/* VFS initialisation function. Return initialised vfs_op_tuple array back to SAMBA. */
-struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
+vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
+ struct smb_vfs_handle_struct *vfs_handle)
{
- struct vfs_ops tmp_ops;
-
*vfs_version = SMB_VFS_INTERFACE_VERSION;
- memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
- tmp_ops.unlink = recycle_unlink;
- tmp_ops.connect = recycle_connect;
- tmp_ops.disconnect = recycle_disconnect;
- memcpy(&recycle_ops, &tmp_ops, sizeof(struct vfs_ops));
- return &recycle_ops;
+ memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
+
+ /* Remember vfs_id for storing private information at connect */
+ recycle_handle = vfs_handle;
+
+ return recycle_ops;
+}
+
+/* VFS finalization function. */
+void vfs_done(connection_struct *conn)
+{
+ DEBUG(3,("vfs_done_recycle: called for connection %p\n",conn));
}
static int recycle_connect(struct connection_struct *conn, const char *service, const char *user)
{
- pstring opts_str;
fstring recycle_bin;
- char *p;
DEBUG(3,("recycle_connect: called for service %s as user %s\n", service, user));
- pstrcpy(opts_str, (const char *)lp_vfs_options(SNUM(conn)));
- if (!*opts_str) {
- DEBUG(3,("recycle_connect: No options listed (%s).\n", lp_vfs_options(SNUM(conn)) ));
+ fstrcpy(recycle_bin, (const char *)lp_parm_string(lp_servicename(SNUM(conn)),"vfs","recycle bin"));
+ if (!*recycle_bin) {
+ DEBUG(3,("recycle_connect: No options listed (vfs:recycle bin).\n" ));
return 0; /* No options. */
}
- p = opts_str;
- if (next_token(&p,recycle_bin,"=",sizeof(recycle_bin))) {
- if (!strequal("recycle", recycle_bin)) {
- DEBUG(3,("recycle_connect: option %s is not recycle\n", recycle_bin ));
- return -1;
- }
- }
-
- if (!next_token(&p,recycle_bin," \n",sizeof(recycle_bin))) {
- DEBUG(3,("recycle_connect: no option after recycle=\n"));
- return -1;
- }
-
- DEBUG(10,("recycle_connect: recycle name is %s\n", recycle_bin ));
+ DEBUG(3,("recycle_connect: recycle name is %s\n", recycle_bin ));
- conn->vfs_private = (void *)strdup(recycle_bin);
+ recycle_handle->data = (void *)strdup(recycle_bin);
return 0;
}
static void recycle_disconnect(struct connection_struct *conn)
{
- SAFE_FREE(conn->vfs_private);
+ SAFE_FREE(recycle_handle->data);
}
static BOOL recycle_XXX_exist(connection_struct *conn, const char *dname, BOOL isdir)
@@ -225,8 +154,8 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
*recycle_bin = '\0';
pstrcpy(fname, inname);
- if (conn->vfs_private)
- fstrcpy(recycle_bin, (const char *)conn->vfs_private);
+ if (recycle_handle->data)
+ fstrcpy(recycle_bin, (const char *)recycle_handle->data);
if(!*recycle_bin) {
DEBUG(3, ("recycle bin: share parameter not set, purging %s...\n", fname));
diff --git a/examples/VFS/skel.c b/examples/VFS/skel.c
index bb5486e690..b937682822 100644
--- a/examples/VFS/skel.c
+++ b/examples/VFS/skel.c
@@ -3,6 +3,7 @@
* calls to disk functions.
*
* Copyright (C) Tim Potter, 1999-2000
+ * Copyright (C) Alexander Bokovoy, 2002
*
* 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
@@ -38,8 +39,8 @@
#include <includes.h>
#include <vfs.h>
-extern struct vfs_ops default_vfs_ops; /* For passthrough operation */
-extern struct vfs_ops skel_ops;
+static struct vfs_ops default_vfs_ops; /* For passthrough operation */
+static struct smb_vfs_handle_struct *skel_handle; /* use skel_handle->data for storing per-instance private data */
static int skel_connect(struct connection_struct *conn, const char *service, const char *user)
{
@@ -349,172 +350,110 @@ static int skel_sys_acl_free_qualifier(struct connection_struct *conn, void *qua
return default_vfs_ops.sys_acl_free_qualifier(conn, qualifier, tagtype);
}
-/* VFS initialisation - return vfs_ops function pointer structure */
-
-struct vfs_ops *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops)
-{
- struct vfs_ops tmp_ops;
-
- DEBUG(3, ("Initialising default vfs hooks\n"));
-
- *vfs_version = SMB_VFS_INTERFACE_VERSION;
- memcpy(&tmp_ops, def_vfs_ops, sizeof(struct vfs_ops));
-
- tmp_ops.connect = skel_connect;
- tmp_ops.disconnect = skel_disconnect;
- tmp_ops.disk_free = skel_disk_free;
-
- /* Directory operations */
-
- tmp_ops.opendir = skel_opendir;
- tmp_ops.readdir = skel_readdir;
- tmp_ops.mkdir = skel_mkdir;
- tmp_ops.rmdir = skel_rmdir;
- tmp_ops.closedir = skel_closedir;
-
- /* File operations */
-
- tmp_ops.open = skel_open;
- tmp_ops.close = skel_close;
- tmp_ops.read = skel_read;
- tmp_ops.write = skel_write;
- tmp_ops.lseek = skel_lseek;
- tmp_ops.rename = skel_rename;
- tmp_ops.fsync = skel_fsync;
- tmp_ops.stat = skel_stat;
- tmp_ops.fstat = skel_fstat;
- tmp_ops.lstat = skel_lstat;
- tmp_ops.unlink = skel_unlink;
- tmp_ops.chmod = skel_chmod;
- tmp_ops.fchmod = skel_fchmod;
- tmp_ops.chown = skel_chown;
- tmp_ops.fchown = skel_fchown;
- tmp_ops.chdir = skel_chdir;
- tmp_ops.getwd = skel_getwd;
- tmp_ops.utime = skel_utime;
- tmp_ops.ftruncate = skel_ftruncate;
- tmp_ops.lock = skel_lock;
- tmp_ops.symlink = skel_symlink;
- tmp_ops.readlink = skel_readlink;
- tmp_ops.link = skel_link;
- tmp_ops.mknod = skel_mknod;
- tmp_ops.realpath = skel_realpath;
-
- tmp_ops.fget_nt_acl = skel_fget_nt_acl;
- tmp_ops.get_nt_acl = skel_get_nt_acl;
- tmp_ops.fset_nt_acl = skel_fset_nt_acl;
- tmp_ops.set_nt_acl = skel_set_nt_acl;
-
- /* POSIX ACL operations. */
-
- tmp_ops.chmod_acl = skel_chmod_acl;
- tmp_ops.fchmod_acl = skel_fchmod_acl;
- tmp_ops.sys_acl_get_entry = skel_sys_acl_get_entry;
- tmp_ops.sys_acl_get_tag_type = skel_sys_acl_get_tag_type;
- tmp_ops.sys_acl_get_permset = skel_sys_acl_get_permset;
- tmp_ops.sys_acl_get_qualifier = skel_sys_acl_get_qualifier;
- tmp_ops.sys_acl_get_file = skel_sys_acl_get_file;
- tmp_ops.sys_acl_get_fd = skel_sys_acl_get_fd;
- tmp_ops.sys_acl_clear_perms = skel_sys_acl_clear_perms;
- tmp_ops.sys_acl_add_perm = skel_sys_acl_add_perm;
- tmp_ops.sys_acl_to_text = skel_sys_acl_to_text;
- tmp_ops.sys_acl_init = skel_sys_acl_init;
- tmp_ops.sys_acl_create_entry = skel_sys_acl_create_entry;
- tmp_ops.sys_acl_set_tag_type = skel_sys_acl_set_tag_type;
- tmp_ops.sys_acl_set_qualifier = skel_sys_acl_set_qualifier;
- tmp_ops.sys_acl_set_permset = skel_sys_acl_set_permset;
- tmp_ops.sys_acl_valid = skel_sys_acl_valid;
- tmp_ops.sys_acl_set_file = skel_sys_acl_set_file;
- tmp_ops.sys_acl_set_fd = skel_sys_acl_set_fd;
- tmp_ops.sys_acl_delete_def_file = skel_sys_acl_delete_def_file;
- tmp_ops.sys_acl_get_perm = skel_sys_acl_get_perm;
- tmp_ops.sys_acl_free_text = skel_sys_acl_free_text;
- tmp_ops.sys_acl_free_acl = skel_sys_acl_free_acl;
- tmp_ops.sys_acl_free_qualifier = skel_sys_acl_free_qualifier;
-
- memcpy(&skel_ops, &tmp_ops, sizeof(struct vfs_ops));
-
- return &skel_ops;
-}
/* VFS operations structure */
-struct vfs_ops skel_ops = {
+static vfs_op_tuple skel_ops[] = {
/* Disk operations */
- skel_connect,
- skel_disconnect,
- skel_disk_free,
+ {skel_connect, SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_disconnect, SMB_VFS_OP_DISCONNECT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_disk_free, SMB_VFS_OP_DISK_FREE, SMB_VFS_LAYER_TRANSPARENT},
/* Directory operations */
- skel_opendir,
- skel_readdir,
- skel_mkdir,
- skel_rmdir,
- skel_closedir,
+ {skel_opendir, SMB_VFS_OP_OPENDIR, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_readdir, SMB_VFS_OP_READDIR, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_mkdir, SMB_VFS_OP_MKDIR, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_rmdir, SMB_VFS_OP_RMDIR, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_closedir, SMB_VFS_OP_CLOSEDIR, SMB_VFS_LAYER_TRANSPARENT},
/* File operations */
- skel_open,
- skel_close,
- skel_read,
- skel_write,
- skel_lseek,
- skel_rename,
- skel_fsync,
- skel_stat,
- skel_fstat,
- skel_lstat,
- skel_unlink,
- skel_chmod,
- skel_fchmod,
- skel_chown,
- skel_fchown,
- skel_chdir,
- skel_getwd,
- skel_utime,
- skel_ftruncate,
- skel_lock,
- skel_symlink,
- skel_readlink,
- skel_link,
- skel_mknod,
- skel_realpath,
+ {skel_open, SMB_VFS_OP_OPEN, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_close, SMB_VFS_OP_CLOSE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_read, SMB_VFS_OP_READ, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_write, SMB_VFS_OP_WRITE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_lseek, SMB_VFS_OP_LSEEK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_rename, SMB_VFS_OP_RENAME, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fsync, SMB_VFS_OP_FSYNC, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_stat, SMB_VFS_OP_STAT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fstat, SMB_VFS_OP_FSTAT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_lstat, SMB_VFS_OP_LSTAT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_unlink, SMB_VFS_OP_UNLINK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_chmod, SMB_VFS_OP_CHMOD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fchmod, SMB_VFS_OP_FCHMOD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_chown, SMB_VFS_OP_CHOWN, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fchown, SMB_VFS_OP_FCHOWN, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_chdir, SMB_VFS_OP_CHDIR, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_getwd, SMB_VFS_OP_GETWD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_utime, SMB_VFS_OP_UTIME, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_ftruncate, SMB_VFS_OP_FTRUNCATE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_lock, SMB_VFS_OP_LOCK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_symlink, SMB_VFS_OP_SYMLINK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_readlink, SMB_VFS_OP_READLINK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_link, SMB_VFS_OP_LINK, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_mknod, SMB_VFS_OP_MKNOD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_realpath, SMB_VFS_OP_REALPATH, SMB_VFS_LAYER_TRANSPARENT},
/* NT File ACL operations */
- skel_fget_nt_acl,
- skel_get_nt_acl,
- skel_fset_nt_acl,
- skel_set_nt_acl,
+ {skel_fget_nt_acl, SMB_VFS_OP_FGET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_get_nt_acl, SMB_VFS_OP_GET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fset_nt_acl, SMB_VFS_OP_FSET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_set_nt_acl, SMB_VFS_OP_SET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
/* POSIX ACL operations */
- skel_chmod_acl,
- skel_fchmod_acl,
-
- skel_sys_acl_get_entry,
- skel_sys_acl_get_tag_type,
- skel_sys_acl_get_permset,
- skel_sys_acl_get_qualifier,
- skel_sys_acl_get_file,
- skel_sys_acl_get_fd,
- skel_sys_acl_clear_perms,
- skel_sys_acl_add_perm,
- skel_sys_acl_to_text,
- skel_sys_acl_init,
- skel_sys_acl_create_entry,
- skel_sys_acl_set_tag_type,
- skel_sys_acl_set_qualifier,
- skel_sys_acl_set_permset,
- skel_sys_acl_valid,
- skel_sys_acl_set_file,
- skel_sys_acl_set_fd,
- skel_sys_acl_delete_def_file,
- skel_sys_acl_get_perm,
- skel_sys_acl_free_text,
- skel_sys_acl_free_acl,
- skel_sys_acl_free_qualifier
+ {skel_chmod_acl, SMB_VFS_OP_CHMOD_ACL, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_fchmod_acl, SMB_VFS_OP_FCHMOD_ACL, SMB_VFS_LAYER_TRANSPARENT},
+
+ {skel_sys_acl_get_entry, SMB_VFS_OP_SYS_ACL_GET_ENTRY, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_tag_type, SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_permset, SMB_VFS_OP_SYS_ACL_GET_PERMSET, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_qualifier, SMB_VFS_OP_SYS_ACL_GET_QUALIFIER, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_file, SMB_VFS_OP_SYS_ACL_GET_FILE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_fd, SMB_VFS_OP_SYS_ACL_GET_FD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_clear_perms, SMB_VFS_OP_SYS_ACL_CLEAR_PERMS, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_add_perm, SMB_VFS_OP_SYS_ACL_ADD_PERM, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_to_text, SMB_VFS_OP_SYS_ACL_TO_TEXT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_init, SMB_VFS_OP_SYS_ACL_INIT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_create_entry, SMB_VFS_OP_SYS_ACL_CREATE_ENTRY, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_set_tag_type, SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_set_qualifier, SMB_VFS_OP_SYS_ACL_SET_QUALIFIER, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_set_permset, SMB_VFS_OP_SYS_ACL_SET_PERMSET, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_valid, SMB_VFS_OP_SYS_ACL_VALID, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_set_file, SMB_VFS_OP_SYS_ACL_SET_FILE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_set_fd, SMB_VFS_OP_SYS_ACL_SET_FD, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_delete_def_file, SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_get_perm, SMB_VFS_OP_SYS_ACL_GET_PERM, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_free_text, SMB_VFS_OP_SYS_ACL_FREE_TEXT, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_free_acl, SMB_VFS_OP_SYS_ACL_FREE_ACL, SMB_VFS_LAYER_TRANSPARENT},
+ {skel_sys_acl_free_qualifier, SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER, SMB_VFS_LAYER_TRANSPARENT},
+
+ {NULL, SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
+
+/* VFS initialisation - return initialized vfs_op_tuple array back to Samba */
+
+vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
+ struct smb_vfs_handle_struct *vfs_handle)
+{
+ DEBUG(3, ("Initialising default vfs hooks\n"));
+
+ *vfs_version = SMB_VFS_INTERFACE_VERSION;
+ memcpy(&default_vfs_ops, def_vfs_ops, sizeof(struct vfs_ops));
+
+ /* Remember vfs_handle for further allocation and referencing of private
+ information in vfs_handle->data
+ */
+ skel_handle = vfs_handle;
+ return skel_ops;
+}
+
+/* VFS finalization function */
+void vfs_done(connection_struct *conn)
+{
+ DEBUG(3, ("Finalizing default vfs hooks\n"));
+}
diff --git a/examples/pdb/README b/examples/pdb/README
index a212604792..561473129b 100644
--- a/examples/pdb/README
+++ b/examples/pdb/README
@@ -1,5 +1,9 @@
README for Samba Password Database (PDB) examples
====================================================
+8-8-2002 Jelmer Vernooij <jelmer@samba.org>
+
+Added mysql and xml modules. See README in xml/ and mysql/ for details.
+
21-6-2002 Stefan (metze) Metzmacher <metze@metzemix.de>
I have added an interface versioning.
diff --git a/examples/pdb/pdb_test.c b/examples/pdb/pdb_test.c
index d2722d2e03..b46fe24bd6 100644
--- a/examples/pdb/pdb_test.c
+++ b/examples/pdb/pdb_test.c
@@ -71,7 +71,7 @@ static BOOL testsam_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *user,
Search by sid
**************************************************************************/
-static BOOL testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user, DOM_SID sid)
+static BOOL testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user, const DOM_SID *sid)
{
DEBUG(10, ("testsam_getsampwsid called\n"));
return False;
@@ -81,7 +81,7 @@ static BOOL testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user,
Delete a SAM_ACCOUNT
****************************************************************************/
-static BOOL testsam_delete_sam_account(struct pdb_methods *methods, const SAM_ACCOUNT *sam_pass)
+static BOOL testsam_delete_sam_account(struct pdb_methods *methods, SAM_ACCOUNT *sam_pass)
{
DEBUG(10, ("testsam_delete_sam_account called\n"));
return False;
@@ -91,7 +91,7 @@ static BOOL testsam_delete_sam_account(struct pdb_methods *methods, const SAM_AC
Modifies an existing SAM_ACCOUNT
****************************************************************************/
-static BOOL testsam_update_sam_account (struct pdb_methods *methods, const SAM_ACCOUNT *newpwd)
+static BOOL testsam_update_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
{
DEBUG(10, ("testsam_update_sam_account called\n"));
return False;
@@ -101,7 +101,7 @@ static BOOL testsam_update_sam_account (struct pdb_methods *methods, const SAM_A
Adds an existing SAM_ACCOUNT
****************************************************************************/
-static BOOL testsam_add_sam_account (struct pdb_methods *methods, const SAM_ACCOUNT *newpwd)
+static BOOL testsam_add_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
{
DEBUG(10, ("testsam_add_sam_account called\n"));
return False;