← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/samba/oneiric-security

« back to all changes in this revision

Viewing changes to packaging/SuSE/samba3-vscan.diff

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-07-21 17:53:23 UTC
  • mfrom: (0.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
packaging/SuSE/samba3-vscan.diff
1
 
--- examples/VFS/samba-vscan-0.3.2b/fprot/Makefile      2003-01-14 00:42:15.000000000 +0100
2
 
+++ examples/VFS/samba-vscan-0.3.2b/fprot/Makefile      2003-04-09 20:21:37.000000000 +0200
3
 
@@ -14,7 +14,7 @@
4
 
 SMBWR_SRC = ../../../../source/smbwrapper
5
 
 SMBVS_INCL = ../include
6
 
 SMBVS_GLB = ../global
7
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
8
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
9
 
 VFS_OBJS = vscan-fprotd.so
10
 
 SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h
11
 
 OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-fprotd.lo vscan-fprotd_core.lo
12
 
--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c        2003-02-21 21:37:44.000000000 +0100
13
 
+++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c        2003-04-09 20:25:25.000000000 +0200
14
 
@@ -432,14 +432,14 @@
15
 
                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
16
 
 
17
 
                                /* add/update file. mark file as infected! */
18
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
19
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
20
 
 
21
 
                                /* virus found, deny access */
22
 
                                errno = EACCES;
23
 
                                return -1;
24
 
                        } else if ( retval == 0 ) {
25
 
                                /* file is clean, add to lrufiles */
26
 
-                               lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
27
 
+                               lrufiles_add(filepath, stat_buf.st_mtime, False);
28
 
                        }
29
 
                }
30
 
 
31
 
--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c   2003-01-25 18:40:57.000000000 +0100
32
 
+++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c   2003-04-09 20:23:31.000000000 +0200
33
 
@@ -110,7 +110,7 @@
34
 
        pstring fprotdCommand;  /* the command line to be send to daemon */
35
 
        char *str;
36
 
        FILE *fpin, *fpout;
37
 
-       bool received_data = FALSE; /* indicates, if any response from deamon was received */
38
 
+       bool received_data = False; /* indicates, if any response from deamon was received */
39
 
 
40
 
        /* open stream sockets */
41
 
         fpin = fdopen(sockfd, "r");
42
 
@@ -159,7 +159,7 @@
43
 
 
44
 
        while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) {
45
 
 
46
 
-               received_data = TRUE;
47
 
+               received_data = True;
48
 
 
49
 
                /* ignore the HTTP response header, remove any leading 
50
 
                   white spaces */
51
 
--- examples/VFS/samba-vscan-0.3.2b/icap/Makefile       2003-01-30 00:53:02.000000000 +0100
52
 
+++ examples/VFS/samba-vscan-0.3.2b/icap/Makefile       2003-04-09 20:21:37.000000000 +0200
53
 
@@ -15,7 +15,7 @@
54
 
 SMBWR_SRC = ../../../../source/smbwrapper
55
 
 SMBVS_INCL = ../include
56
 
 SMBVS_GLB = ../global
57
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC
58
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
59
 
 VFS_OBJS = vscan-icap.so
60
 
 SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-icap.c vscan-icap_core.c vscan-icap.h vscan-icap_core.h
61
 
 OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-icap.lo vscan-icap_core.lo
62
 
--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c   2003-02-21 21:37:50.000000000 +0100
63
 
+++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c   2003-04-09 20:32:20.000000000 +0200
64
 
@@ -413,14 +413,14 @@
65
 
                                 rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
66
 
 
67
 
                                /* add/update file. mark file as infected! */
68
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
69
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
70
 
 
71
 
                                 /* virus found, deny access */
72
 
                                 errno = EACCES;
73
 
                                 return -1;
74
 
                        } else if ( retval == 0 ) {
75
 
                                 /* file is clean, add to lrufiles */
76
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
77
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
78
 
                         }
79
 
                 }
80
 
 
81
 
--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c      2003-01-15 00:19:18.000000000 +0100
82
 
+++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c      2003-04-09 20:30:56.000000000 +0200
83
 
@@ -114,8 +114,8 @@
84
 
         char buf[BUFLEN];
85
 
         char recvline[MAXLINE + 1];
86
 
        char *str;
87
 
-               bool first_line = FALSE; /* first line we've received? */
88
 
-        bool infected = FALSE; /* an infected found? */
89
 
+               bool first_line = False; /* first line we've received? */
90
 
+        bool infected = False; /* an infected found? */
91
 
 
92
 
 
93
 
        /* get file length */
94
 
@@ -213,7 +213,7 @@
95
 
        /* set line buffering */
96
 
         setvbuf(fpin, (char *)NULL, _IOLBF, 0);
97
 
 
98
 
-        first_line = TRUE;
99
 
+        first_line = True;
100
 
         while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) {
101
 
                str = recvline;
102
 
                if ( first_line ) {
103
 
@@ -226,7 +226,7 @@
104
 
                                                return(0);
105
 
                                         }
106
 
                                         else if ( strncmp("403", str, 3) == 0 ) {
107
 
-                                                infected = TRUE;
108
 
+                                                infected = True;
109
 
                                         } else {
110
 
                                                if ( verbose_file_logging )
111
 
                                                        vscan_syslog("ERROR: file %s not found, not readable or an error occured", scan_file);
112
 
@@ -241,7 +241,7 @@
113
 
                                return(-1);
114
 
                         }
115
 
 
116
 
-                        first_line = FALSE;
117
 
+                        first_line = False;
118
 
                 }
119
 
                if ( infected ) {
120
 
                        if ( strncmp("X-Infection-Found", str, 17) == 0 ) {
121
 
--- examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h      2002-11-25 16:48:10.000000000 +0100
122
 
+++ examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h      2003-04-09 20:21:37.000000000 +0200
123
 
@@ -93,7 +93,7 @@
124
 
 */
125
 
 
126
 
 #ifndef SAMBA_VERSION_MAJOR
127
 
-# define SAMBA_VERSION_MAJOR 2 
128
 
+# define SAMBA_VERSION_MAJOR 3 
129
 
 #endif
130
 
 
131
 
 #ifndef SAMBA_VERSION_MINOR
132
 
--- examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile  2003-02-20 15:41:32.000000000 +0100
133
 
+++ examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile  2003-04-09 20:21:37.000000000 +0200
134
 
@@ -23,9 +23,9 @@
135
 
 VFS_OBJS = vscan-kavp.so
136
 
 
137
 
 ifdef USE_DEBUG
138
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
139
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
140
 
 else
141
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC
142
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
143
 
 endif
144
 
 
145
 
 ifndef USE_KAVPSHAREDLIB
146
 
--- examples/VFS/samba-vscan-0.3.2b/mks/Makefile        2003-01-19 18:09:53.000000000 +0100
147
 
+++ examples/VFS/samba-vscan-0.3.2b/mks/Makefile        2003-04-09 20:21:37.000000000 +0200
148
 
@@ -16,10 +16,10 @@
149
 
 SMBWR_SRC = ../../../../source/smbwrapper
150
 
 SMBVS_INCL = ../include
151
 
 SMBVS_GLB = ../global
152
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
153
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
154
 
 
155
 
 ifdef USE_INCLMKSDLIB
156
 
-CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC
157
 
+CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC -I/usr/include/heimdal
158
 
 endif
159
 
 
160
 
 VFS_OBJS = vscan-mksd.so
161
 
--- examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c    2003-02-21 21:37:50.000000000 +0100
162
 
+++ examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c    2003-04-09 20:38:16.000000000 +0200
163
 
@@ -393,14 +393,14 @@
164
 
                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
165
 
 
166
 
                                 /* add/update file. mark file as infected! */
167
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
168
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
169
 
 
170
 
                                /* virus found, deny acces */
171
 
                                errno = EACCES; 
172
 
                                return -1;
173
 
                         } else if ( retval == 0 ) {
174
 
                                 /* file is clean, add to lrufiles */
175
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
176
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
177
 
                        }
178
 
                }
179
 
 
180
 
--- examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile      2003-01-30 00:53:08.000000000 +0100
181
 
+++ examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile      2003-04-09 20:21:37.000000000 +0200
182
 
@@ -15,7 +15,7 @@
183
 
 SMBWR_SRC = ../../../../source/smbwrapper
184
 
 SMBVS_INCL = ../include
185
 
 SMBVS_GLB = ../global
186
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
187
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
188
 
 VFS_OBJS = vscan-oav.so
189
 
 SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h
190
 
 OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-oav.lo vscan-oav_core.lo
191
 
--- examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c   2003-02-21 21:37:51.000000000 +0100
192
 
+++ examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c   2003-04-09 20:40:53.000000000 +0200
193
 
@@ -417,14 +417,14 @@
194
 
                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
195
 
 
196
 
                                 /* add/update file. mark file as infected! */
197
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
198
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
199
 
 
200
 
                                /* virus found, deny access */
201
 
                                errno = EACCES; 
202
 
                                return -1;
203
 
                         } else if ( retval == 0 ) {
204
 
                                 /* file is clean, add to lrufiles */
205
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
206
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
207
 
                         }
208
 
                }
209
 
 
210
 
--- examples/VFS/samba-vscan-0.3.2b/sophos/Makefile     2003-01-30 00:53:08.000000000 +0100
211
 
+++ examples/VFS/samba-vscan-0.3.2b/sophos/Makefile     2003-04-09 20:21:37.000000000 +0200
212
 
@@ -15,7 +15,7 @@
213
 
 SMBWR_SRC = ../../../../source/smbwrapper
214
 
 SMBVS_INCL = ../include
215
 
 SMBVS_GLB = ../global
216
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
217
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
218
 
 VFS_OBJS = vscan-sophos.so
219
 
 SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h
220
 
 OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-sophos.lo vscan-sophos_core.lo
221
 
--- examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c       2003-02-21 21:37:51.000000000 +0100
222
 
+++ examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c       2003-04-09 20:43:11.000000000 +0200
223
 
@@ -399,14 +399,14 @@
224
 
                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
225
 
 
226
 
                                 /* add/update file. mark file as infected! */
227
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
228
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
229
 
 
230
 
                                /* deny access */
231
 
                                errno = EACCES; 
232
 
                                return -1;
233
 
                         } else if ( retval == 0 ) {
234
 
                                 /* file is clean, add to lrufiles */
235
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
236
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
237
 
                         }
238
 
                }
239
 
 
240
 
--- examples/VFS/samba-vscan-0.3.2b/trend/Makefile      2003-01-30 01:03:38.000000000 +0100
241
 
+++ examples/VFS/samba-vscan-0.3.2b/trend/Makefile      2003-04-09 20:21:37.000000000 +0200
242
 
@@ -15,7 +15,7 @@
243
 
 SMBWR_SRC = ../../../../source/smbwrapper
244
 
 SMBVS_INCL = ../include
245
 
 SMBVS_GLB = ../global
246
 
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
247
 
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
248
 
 VFS_OBJS = vscan-trend.so
249
 
 SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h
250
 
 OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-trend.lo vscan-trend_core.lo
251
 
--- examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-02-21 21:37:52.000000000 +0100
252
 
+++ examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-04-09 20:46:07.000000000 +0200
253
 
@@ -409,14 +409,14 @@
254
 
                                rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
255
 
 
256
 
                                 /* add/update file. mark file as infected! */
257
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
258
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, True);
259
 
 
260
 
                                /* deny access */
261
 
                                errno = EACCES; 
262
 
                                return -1;
263
 
                         } else if ( retval == 0 ) {
264
 
                                 /* file is clean, add to lrufiles */
265
 
-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
266
 
+                                lrufiles_add(filepath, stat_buf.st_mtime, False);
267
 
                         }
268
 
                }
269