1 Index: src/gnome2-console/console_conf.c
2 ===================================================================
3 --- src/gnome2-console/console_conf.c (revision 7106)
4 +++ src/gnome2-console/console_conf.c (working copy)
7 Bacula® - The Network Backup Solution
9 - Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
10 + Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
12 The main author of Bacula is Kern Sibbald, with contributions from
13 many others, a complete list can be found in the file AUTHORS.
15 {"dirport", store_int, ITEM(dir_res.DIRport), 0, ITEM_DEFAULT, 9101},
16 {"address", store_str, ITEM(dir_res.address), 0, ITEM_REQUIRED, 0},
17 {"password", store_password, ITEM(dir_res.password), 0, 0, 0},
18 - {"tlsenable", store_bit, ITEM(dir_res.tls_enable), 1, 0, 0},
19 - {"tlsrequire", store_bit, ITEM(dir_res.tls_require), 1, 0, 0},
20 + {"tlsenable", store_bool, ITEM(dir_res.tls_enable), 1, 0, 0},
21 + {"tlsrequire", store_bool, ITEM(dir_res.tls_require), 1, 0, 0},
22 {"tlscacertificatefile", store_dir, ITEM(dir_res.tls_ca_certfile), 0, 0, 0},
23 {"tlscacertificatedir", store_dir, ITEM(dir_res.tls_ca_certdir), 0, 0, 0},
24 {"tlscertificate", store_dir, ITEM(dir_res.tls_certfile), 0, 0, 0},
26 {"name", store_name, ITEM(con_res.hdr.name), 0, ITEM_REQUIRED, 0},
27 {"description", store_str, ITEM(con_res.hdr.desc), 0, 0, 0},
28 {"password", store_password, ITEM(con_res.password), 0, ITEM_REQUIRED, 0},
29 - {"tlsenable", store_bit, ITEM(con_res.tls_enable), 1, 0, 0},
30 - {"tlsrequire", store_bit, ITEM(con_res.tls_require), 1, 0, 0},
31 + {"tlsenable", store_bool, ITEM(con_res.tls_enable), 1, 0, 0},
32 + {"tlsrequire", store_bool, ITEM(con_res.tls_require), 1, 0, 0},
33 {"tlscacertificatefile", store_dir, ITEM(con_res.tls_ca_certfile), 0, 0, 0},
34 {"tlscacertificatedir", store_dir, ITEM(con_res.tls_ca_certdir), 0, 0, 0},
35 {"tlscertificate", store_dir, ITEM(con_res.tls_certfile), 0, 0, 0},
36 Index: src/gnome2-console/console_conf.h
37 ===================================================================
38 --- src/gnome2-console/console_conf.h (revision 7106)
39 +++ src/gnome2-console/console_conf.h (working copy)
42 Bacula® - The Network Backup Solution
44 - Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
45 + Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
47 The main author of Bacula is Kern Sibbald, with contributions from
48 many others, a complete list can be found in the file AUTHORS.
50 int DIRport; /* UA server port */
51 char *address; /* UA server address */
52 char *password; /* UA server password */
53 - int tls_enable; /* Enable TLS */
54 - int tls_require; /* Require TLS */
55 + bool tls_enable; /* Enable TLS */
56 + bool tls_require; /* Require TLS */
57 char *tls_ca_certfile; /* TLS CA Certificate File */
58 char *tls_ca_certdir; /* TLS CA Certificate Directory */
59 char *tls_certfile; /* TLS Client Certificate File */
63 char *password; /* UA server password */
64 - int tls_enable; /* Enable TLS on all connections */
65 - int tls_require; /* Require TLS on all connections */
66 + bool tls_enable; /* Enable TLS on all connections */
67 + bool tls_require; /* Require TLS on all connections */
68 char *tls_ca_certfile; /* TLS CA Certificate File */
69 char *tls_ca_certdir; /* TLS CA Certificate Directory */
70 char *tls_certfile; /* TLS Client Certificate File */
71 Index: src/wx-console/console_conf.c
72 ===================================================================
73 --- src/wx-console/console_conf.c (revision 7106)
74 +++ src/wx-console/console_conf.c (working copy)
76 {"rcfile", store_dir, ITEM(res_cons.rc_file), 0, 0, 0},
77 {"historyfile", store_dir, ITEM(res_cons.hist_file), 0, 0, 0},
78 {"password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
79 - {"tlsenable", store_bit, ITEM(res_cons.tls_enable), 1, 0, 0},
80 - {"tlsrequire", store_bit, ITEM(res_cons.tls_require), 1, 0, 0},
81 {"tlscacertificatefile", store_dir, ITEM(res_cons.tls_ca_certfile), 0, 0, 0},
82 {"tlscacertificatedir", store_dir, ITEM(res_cons.tls_ca_certdir), 0, 0, 0},
83 {"tlscertificate", store_dir, ITEM(res_cons.tls_certfile), 0, 0, 0},
84 {"tlskey", store_dir, ITEM(res_cons.tls_keyfile), 0, 0, 0},
85 + {"tlsenable", store_bool, ITEM(res_cons.tls_enable), 1, 0, 0},
86 + {"tlsrequire", store_bool, ITEM(res_cons.tls_require), 1, 0, 0},
87 {NULL, NULL, {0}, 0, 0, 0}
91 {"dirport", store_int, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
92 {"address", store_str, ITEM(res_dir.address), 0, 0, 0},
93 {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
94 - {"tlsenable", store_bit, ITEM(res_dir.tls_enable), 1, 0, 0},
95 - {"tlsrequire", store_bit, ITEM(res_dir.tls_require), 1, 0, 0},
96 {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
97 {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
98 {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
99 {"tlskey", store_dir, ITEM(res_dir.tls_keyfile), 0, 0, 0},
100 + {"tlsenable", store_bool, ITEM(res_dir.tls_enable), 1, 0, 0},
101 + {"tlsrequire", store_bool, ITEM(res_dir.tls_require), 1, 0, 0},
102 {NULL, NULL, {0}, 0, 0, 0}
105 Index: src/wx-console/console_conf.h
106 ===================================================================
107 --- src/wx-console/console_conf.h (revision 7106)
108 +++ src/wx-console/console_conf.h (working copy)
111 Bacula® - The Network Backup Solution
113 - Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
114 + Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
116 The main author of Bacula is Kern Sibbald, with contributions from
117 many others, a complete list can be found in the file AUTHORS.
119 char *rc_file; /* startup file */
120 char *hist_file; /* command history file */
121 char *password; /* UA server password */
122 - int tls_enable; /* Enable TLS on all connections */
123 - int tls_require; /* Require TLS on all connections */
124 char *tls_ca_certfile; /* TLS CA Certificate File */
125 char *tls_ca_certdir; /* TLS CA Certificate Directory */
126 char *tls_certfile; /* TLS Client Certificate File */
127 char *tls_keyfile; /* TLS Client Key File */
129 TLS_CONTEXT *tls_ctx; /* Shared TLS Context */
130 + bool tls_enable; /* Enable TLS on all connections */
131 + bool tls_require; /* Require TLS on all connections */
136 int DIRport; /* UA server port */
137 char *address; /* UA server address */
138 char *password; /* UA server password */
139 - int tls_enable; /* Enable TLS on all connections */
140 - int tls_require; /* Require TLS on all connections */
141 char *tls_ca_certfile; /* TLS CA Certificate File */
142 char *tls_ca_certdir; /* TLS CA Certificate Directory */
143 char *tls_certfile; /* TLS Client Certificate File */
144 char *tls_keyfile; /* TLS Client Key File */
146 TLS_CONTEXT *tls_ctx; /* Shared TLS Context */
147 + bool tls_enable; /* Enable TLS on all connections */
148 + bool tls_require; /* Require TLS on all connections */
152 Index: src/stored/stored_conf.c
153 ===================================================================
154 --- src/stored/stored_conf.c (revision 7106)
155 +++ src/stored/stored_conf.c (working copy)
158 Bacula® - The Network Backup Solution
160 - Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
161 + Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
163 The main author of Bacula is Kern Sibbald, with contributions from
164 many others, a complete list can be found in the file AUTHORS.
166 {"scriptsdirectory", store_dir, ITEM(res_store.scripts_directory), 0, 0, 0},
167 {"maximumconcurrentjobs", store_pint, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, 20},
168 {"heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, 0},
169 - {"tlsenable", store_bit, ITEM(res_store.tls_enable), 1, 0, 0},
170 - {"tlsrequire", store_bit, ITEM(res_store.tls_require), 1, 0, 0},
171 - {"tlsverifypeer", store_bit, ITEM(res_store.tls_verify_peer), 1, ITEM_DEFAULT, 1},
172 + {"tlsenable", store_bool, ITEM(res_store.tls_enable), 1, 0, 0},
173 + {"tlsrequire", store_bool, ITEM(res_store.tls_require), 1, 0, 0},
174 + {"tlsverifypeer", store_bool, ITEM(res_store.tls_verify_peer), 1, ITEM_DEFAULT, 1},
175 {"tlscacertificatefile", store_dir, ITEM(res_store.tls_ca_certfile), 0, 0, 0},
176 {"tlscacertificatedir", store_dir, ITEM(res_store.tls_ca_certdir), 0, 0, 0},
177 {"tlscertificate", store_dir, ITEM(res_store.tls_certfile), 0, 0, 0},
179 {"name", store_name, ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
180 {"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
181 {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
182 - {"monitor", store_bit, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0},
183 - {"tlsenable", store_bit, ITEM(res_dir.tls_enable), 1, 0, 0},
184 - {"tlsrequire", store_bit, ITEM(res_dir.tls_require), 1, 0, 0},
185 - {"tlsverifypeer", store_bit, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1},
186 + {"monitor", store_bool, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0},
187 + {"tlsenable", store_bool, ITEM(res_dir.tls_enable), 1, 0, 0},
188 + {"tlsrequire", store_bool, ITEM(res_dir.tls_require), 1, 0, 0},
189 + {"tlsverifypeer", store_bool, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1},
190 {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
191 {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
192 {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
194 {"checklabels", store_bit, ITEM(res_dev.cap_bits), CAP_CHECKLABELS, ITEM_DEFAULT, 0},
195 {"requiresmount", store_bit, ITEM(res_dev.cap_bits), CAP_REQMOUNT, ITEM_DEFAULT, 0},
196 {"offlineonunmount", store_bit, ITEM(res_dev.cap_bits), CAP_OFFLINEUNMOUNT, ITEM_DEFAULT, 0},
197 - {"autoselect", store_bit, ITEM(res_dev.autoselect), 1, ITEM_DEFAULT, 1},
198 + {"autoselect", store_bool, ITEM(res_dev.autoselect), 1, ITEM_DEFAULT, 1},
199 {"changerdevice", store_strname,ITEM(res_dev.changer_name), 0, 0, 0},
200 {"changercommand", store_strname,ITEM(res_dev.changer_command), 0, 0, 0},
201 {"alertcommand", store_strname,ITEM(res_dev.alert_command), 0, 0, 0},
206 -// {"mountanonymousvolumes", store_bit, ITEM(res_dev.cap_bits), CAP_ANONVOLS, ITEM_DEFAULT, 0},
209 /* Message resource */
210 extern RES_ITEM msgs_items[];
212 Index: src/stored/stored_conf.h
213 ===================================================================
214 --- src/stored/stored_conf.h (revision 7106)
215 +++ src/stored/stored_conf.h (working copy)
218 Bacula® - The Network Backup Solution
220 - Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
221 + Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
223 The main author of Bacula is Kern Sibbald, with contributions from
224 many others, a complete list can be found in the file AUTHORS.
226 char *spool_directory; /* Spool file directory */
227 int dev_type; /* device type */
228 int label_type; /* label type */
229 - int autoselect; /* Automatically select from AutoChanger */
230 + bool autoselect; /* Automatically select from AutoChanger */
231 uint32_t drive_index; /* Autochanger drive index */
232 - uint32_t cap_bits; /* Capabilities of this device */
233 + int cap_bits; /* Capabilities of this device */
234 utime_t max_changer_wait; /* Changer timeout */
235 utime_t max_rewind_wait; /* maximum secs to wait for rewind */
236 utime_t max_open_wait; /* maximum secs to wait for open */
237 Index: src/console/console_conf.c
238 ===================================================================
239 --- src/console/console_conf.c (revision 7106)
240 +++ src/console/console_conf.c (working copy)
243 Bacula® - The Network Backup Solution
245 - Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
246 + Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
248 The main author of Bacula is Kern Sibbald, with contributions from
249 many others, a complete list can be found in the file AUTHORS.
251 {"rcfile", store_dir, ITEM(res_cons.rc_file), 0, 0, 0},
252 {"historyfile", store_dir, ITEM(res_cons.hist_file), 0, 0, 0},
253 {"password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
254 - {"tlsenable", store_bit, ITEM(res_cons.tls_enable), 1, 0, 0},
255 - {"tlsrequire", store_bit, ITEM(res_cons.tls_require), 1, 0, 0},
256 + {"tlsenable", store_bool, ITEM(res_cons.tls_enable), 1, 0, 0},
257 + {"tlsrequire", store_bool, ITEM(res_cons.tls_require), 1, 0, 0},
258 {"tlscacertificatefile", store_dir, ITEM(res_cons.tls_ca_certfile), 0, 0, 0},
259 {"tlscacertificatedir", store_dir, ITEM(res_cons.tls_ca_certdir), 0, 0, 0},
260 {"tlscertificate", store_dir, ITEM(res_cons.tls_certfile), 0, 0, 0},
262 {"dirport", store_int, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
263 {"address", store_str, ITEM(res_dir.address), 0, 0, 0},
264 {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
265 - {"tlsenable", store_bit, ITEM(res_dir.tls_enable), 1, 0, 0},
266 - {"tlsrequire", store_bit, ITEM(res_dir.tls_require), 1, 0, 0},
267 + {"tlsenable", store_bool, ITEM(res_dir.tls_enable), 1, 0, 0},
268 + {"tlsrequire", store_bool, ITEM(res_dir.tls_require), 1, 0, 0},
269 {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
270 {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
271 {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
272 Index: src/console/console_conf.h
273 ===================================================================
274 --- src/console/console_conf.h (revision 7106)
275 +++ src/console/console_conf.h (working copy)
277 char *rc_file; /* startup file */
278 char *hist_file; /* command history file */
279 char *password; /* UA server password */
280 - int tls_enable; /* Enable TLS on all connections */
281 - int tls_require; /* Require TLS on all connections */
282 char *tls_ca_certfile; /* TLS CA Certificate File */
283 char *tls_ca_certdir; /* TLS CA Certificate Directory */
284 char *tls_certfile; /* TLS Client Certificate File */
285 char *tls_keyfile; /* TLS Client Key File */
286 char *director; /* bind to director */
287 utime_t heartbeat_interval; /* Interval to send heartbeats to Dir */
289 TLS_CONTEXT *tls_ctx; /* Shared TLS Context */
290 + bool tls_enable; /* Enable TLS on all connections */
291 + bool tls_require; /* Require TLS on all connections */
296 int DIRport; /* UA server port */
297 char *address; /* UA server address */
298 char *password; /* UA server password */
299 - int tls_enable; /* Enable TLS */
300 - int tls_require; /* Require TLS */
301 char *tls_ca_certfile; /* TLS CA Certificate File */
302 char *tls_ca_certdir; /* TLS CA Certificate Directory */
303 char *tls_certfile; /* TLS Client Certificate File */
304 char *tls_keyfile; /* TLS Client Key File */
305 utime_t heartbeat_interval; /* Interval to send heartbeats to Dir */
307 TLS_CONTEXT *tls_ctx; /* Shared TLS Context */
308 + bool tls_enable; /* Enable TLS */
309 + bool tls_require; /* Require TLS */
313 Index: src/tray-monitor/tray_conf.c
314 ===================================================================
315 --- src/tray-monitor/tray_conf.c (revision 7106)
316 +++ src/tray-monitor/tray_conf.c (working copy)
318 static RES_ITEM mon_items[] = {
319 {"name", store_name, ITEM(res_monitor.hdr.name), 0, ITEM_REQUIRED, 0},
320 {"description", store_str, ITEM(res_monitor.hdr.desc), 0, 0, 0},
321 - {"requiressl", store_bit, ITEM(res_monitor.require_ssl), 1, ITEM_DEFAULT, 0},
322 + {"requiressl", store_bool, ITEM(res_monitor.require_ssl), 1, ITEM_DEFAULT, 0},
323 {"password", store_password, ITEM(res_monitor.password), 0, ITEM_REQUIRED, 0},
324 {"refreshinterval", store_time,ITEM(res_monitor.RefreshInterval), 0, ITEM_DEFAULT, 5},
325 {"fdconnecttimeout", store_time,ITEM(res_monitor.FDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
327 {"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
328 {"dirport", store_int, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
329 {"address", store_str, ITEM(res_dir.address), 0, 0, 0},
330 - {"enablessl", store_bit, ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
331 + {"enablessl", store_bool, ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
332 {NULL, NULL, {0}, 0, 0, 0}
336 {"address", store_str, ITEM(res_client.address), 0, ITEM_REQUIRED, 0},
337 {"fdport", store_pint, ITEM(res_client.FDport), 0, ITEM_DEFAULT, 9102},
338 {"password", store_password, ITEM(res_client.password), 0, ITEM_REQUIRED, 0},
339 - {"enablessl", store_bit, ITEM(res_client.enable_ssl), 1, ITEM_DEFAULT, 0},
340 + {"enablessl", store_bool, ITEM(res_client.enable_ssl), 1, ITEM_DEFAULT, 0},
341 {NULL, NULL, {0}, 0, 0, 0}
345 {"sdaddress", store_str, ITEM(res_store.address), 0, 0, 0},
346 {"password", store_password, ITEM(res_store.password), 0, ITEM_REQUIRED, 0},
347 {"sdpassword", store_password, ITEM(res_store.password), 0, 0, 0},
348 - {"enablessl", store_bit, ITEM(res_store.enable_ssl), 1, ITEM_DEFAULT, 0},
349 + {"enablessl", store_bool, ITEM(res_store.enable_ssl), 1, ITEM_DEFAULT, 0},
350 {NULL, NULL, {0}, 0, 0, 0}
353 Index: src/tray-monitor/tray_conf.h
354 ===================================================================
355 --- src/tray-monitor/tray_conf.h (revision 7106)
356 +++ src/tray-monitor/tray_conf.h (working copy)
359 Bacula® - The Network Backup Solution
361 - Copyright (C) 2004-2007 Free Software Foundation Europe e.V.
362 + Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
364 The main author of Bacula is Kern Sibbald, with contributions from
365 many others, a complete list can be found in the file AUTHORS.
368 int DIRport; /* UA server port */
369 char *address; /* UA server address */
370 - int enable_ssl; /* Use SSL */
371 + bool enable_ssl; /* Use SSL */
376 int FDport; /* Where File daemon listens */
379 - int enable_ssl; /* Use SSL */
380 + bool enable_ssl; /* Use SSL */
385 int SDport; /* port where Directors connect */
388 - int enable_ssl; /* Use SSL */
389 + bool enable_ssl; /* Use SSL */