summaryrefslogtreecommitdiff
blob: a9bed192d96c53bd653198a4fd6dd94eb7fea9bc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff -Naur burp-1.3.48/manpages/bedup.8 burp-1.3.48.new/manpages/bedup.8
--- burp-1.3.48/manpages/bedup.8	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/manpages/bedup.8	2014-11-22 12:57:20.241299376 +0100
@@ -16,7 +16,7 @@
 .SH OPTIONS
 .TP
 \fB\-c\fR \fBpath\fR
-Path to config file (default: /etc/burp/burp.conf).
+Path to config file (default: /etc/burp/burp-server.conf).
 .TP
 \fB\-g\fR \fB<list of group names>\fR
 Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
@@ -42,7 +42,7 @@
 \fB\-V\fR \fB\fR
 Print version and exit.\fR
 .TP
-By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
 .TP
 With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
 
diff -Naur burp-1.3.48/src/bedup.c burp-1.3.48.new/src/bedup.c
--- burp-1.3.48/src/bedup.c	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/src/bedup.c	2014-11-22 12:57:20.241299376 +0100
@@ -734,7 +734,7 @@
 static char *get_config_path(void)
 {
         static char path[256]="";
-        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
+        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
         return path;
 }