]>
Commit | Line | Data |
---|---|---|
b5796cef | 1 | diff -urN samba-2.2.3.orig/examples/VFS/audit.c samba-2.2.3/examples/VFS/audit.c |
2 | --- samba-2.2.3.orig/examples/VFS/audit.c Sat Oct 13 22:08:56 2001 | |
3 | +++ samba-2.2.3/examples/VFS/audit.c Sun Feb 3 17:15:57 2002 | |
4 | @@ -107,11 +107,13 @@ | |
5 | /* VFS initialisation function. Return initialised vfs_ops structure | |
6 | back to SAMBA. */ | |
7 | ||
8 | -BOOL vfs_init(connection_struct *conn) | |
9 | +struct vfs_ops* vfs_init(int* Version, struct vfs_ops *ops) | |
10 | { | |
11 | openlog("smbd_audit", LOG_PID, SYSLOG_FACILITY); | |
12 | syslog(SYSLOG_PRIORITY, "VFS_INIT: vfs_ops loaded\n"); | |
13 | - return True; | |
14 | + *Version = SMB_VFS_INTERFACE_VERSION; | |
15 | + return (&audit_ops); | |
16 | + | |
17 | } | |
18 | ||
19 | /* Implementation of vfs_ops. Pass everything on to the default | |
20 | diff -urN samba-2.2.3.orig/source/Makefile.in samba-2.2.3/source/Makefile.in | |
21 | --- samba-2.2.3.orig/source/Makefile.in Sun Feb 3 01:46:05 2002 | |
22 | +++ samba-2.2.3/source/Makefile.in Sun Feb 3 17:16:35 2002 | |
23 | @@ -487,7 +487,7 @@ | |
24 | ||
25 | bin/smbd: $(SMBD_OBJ) bin/.dummy | |
26 | @echo Linking $@ | |
27 | - @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LIBS) | |
28 | + @$(CC) $(FLAGS) -rdynamic -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LIBS) | |
29 | ||
30 | bin/nmbd: $(NMBD_OBJ) bin/.dummy | |
31 | @echo Linking $@ | |
32 | diff -urN samba-2.2.3.orig/source/include/proto.h samba-2.2.3/source/include/proto.h | |
33 | --- samba-2.2.3.orig/source/include/proto.h Sun Feb 3 01:46:40 2002 | |
34 | +++ samba-2.2.3/source/include/proto.h Sun Feb 3 17:17:12 2002 | |
35 | @@ -4543,7 +4543,7 @@ | |
36 | ||
37 | /*The following definitions come from smbd/vfs.c */ | |
38 | ||
39 | -BOOL vfs_init(connection_struct *conn); | |
40 | +BOOL smbd_vfs_init(connection_struct *conn); | |
41 | BOOL vfs_directory_exist(connection_struct *conn, char *dname, SMB_STRUCT_STAT *st); | |
42 | int vfs_mkdir(connection_struct *conn, char *fname, mode_t mode); | |
43 | char *vfs_getwd(connection_struct *conn, char *unix_path); | |
44 | diff -urN samba-2.2.3.orig/source/include/stamp-h samba-2.2.3/source/include/stamp-h | |
45 | --- samba-2.2.3.orig/source/include/stamp-h Thu Jan 1 01:00:00 1970 | |
46 | +++ samba-2.2.3/source/include/stamp-h Sun Feb 3 17:25:39 2002 | |
47 | @@ -0,0 +1 @@ | |
48 | +Sun Jul 18 20:32:29 UTC 1999 | |
49 | diff -urN samba-2.2.3.orig/source/msdfs/msdfs.c samba-2.2.3/source/msdfs/msdfs.c | |
50 | --- samba-2.2.3.orig/source/msdfs/msdfs.c Sun Feb 3 01:46:44 2002 | |
51 | +++ samba-2.2.3/source/msdfs/msdfs.c Sun Feb 3 17:17:29 2002 | |
52 | @@ -88,7 +88,7 @@ | |
53 | conn->service = snum; | |
54 | conn->connectpath = lp_pathname(snum); | |
55 | ||
56 | - if (!vfs_init(conn)) { | |
57 | + if (!smbd_vfs_init(conn)) { | |
58 | DEBUG(0,("create_conn_struct: vfs init failed.\n")); | |
59 | return False; | |
60 | } | |
61 | diff -urN samba-2.2.3.orig/source/smbd/service.c samba-2.2.3/source/smbd/service.c | |
62 | --- samba-2.2.3.orig/source/smbd/service.c Sun Feb 3 01:46:56 2002 | |
63 | +++ samba-2.2.3/source/smbd/service.c Sun Feb 3 17:18:31 2002 | |
64 | @@ -537,7 +537,7 @@ | |
65 | } | |
66 | /* Initialise VFS function pointers */ | |
67 | ||
68 | - if (!vfs_init(conn)) { | |
69 | + if (!smbd_vfs_init(conn)) { | |
70 | DEBUG(0, ("vfs_init failed for service %s\n", lp_servicename(SNUM(conn)))); | |
71 | yield_connection(conn, lp_servicename(SNUM(conn))); | |
72 | conn_free(conn); | |
73 | diff -urN samba-2.2.3.orig/source/smbd/vfs.c samba-2.2.3/source/smbd/vfs.c | |
74 | --- samba-2.2.3.orig/source/smbd/vfs.c Sun Feb 3 01:46:57 2002 | |
75 | +++ samba-2.2.3/source/smbd/vfs.c Sun Feb 3 17:37:54 2002 | |
76 | @@ -273,7 +273,7 @@ | |
77 | Generic VFS init. | |
78 | ******************************************************************/ | |
79 | ||
80 | -BOOL vfs_init(connection_struct *conn) | |
81 | +BOOL smbd_vfs_init(connection_struct *conn) | |
82 | { | |
83 | if (*lp_vfsobj(SNUM(conn))) { | |
84 | #ifdef HAVE_LIBDL | |
85 | @@ -281,13 +281,13 @@ | |
86 | /* Loadable object file */ | |
87 | ||
88 | if (!vfs_init_custom(conn)) { | |
89 | - DEBUG(0, ("vfs_init: vfs_init_custom failed\n")); | |
90 | + DEBUG(0, ("smbd_vfs_init: vfs_init_custom failed\n")); | |
91 | return False; | |
92 | } | |
93 | ||
94 | return True; | |
95 | #else | |
96 | - DEBUG(0, ("vfs_init: No libdl present - cannot use VFS objects\n")); | |
97 | + DEBUG(0, ("smbd_vfs_init: No libdl present - cannot use VFS objects\n")); | |
98 | return False; | |
99 | #endif | |
100 | } |