Merge lp:~misterc/ubuntu/maverick/davfs2/davfs2.746700 into lp:ubuntu/maverick-proposed/davfs2

Proposed by Michael R. Crusoe on 2011-03-31
Status: Needs review
Proposed branch: lp:~misterc/ubuntu/maverick/davfs2/davfs2.746700
Merge into: lp:ubuntu/maverick-proposed/davfs2
Diff against target: 170 lines (+95/-32)
2 files modified
debian/changelog (+24/-1)
src/mount_davfs.c (+71/-31)
To merge this branch: bzr merge lp:~misterc/ubuntu/maverick/davfs2/davfs2.746700
Reviewer Review Type Date Requested Status
Martin Pitt 2011-03-31 Pending
Review via email: mp+55839@code.launchpad.net

Description of the change

For maverick, a clean, combined fix for LP: #459998 & LP: #746700

To post a comment you must log in.

Unmerged revisions

20. By Michael R. Crusoe on 2011-03-31

* Warn on misplaced configuration options, don't exit (LP: #746700)
* Add kernoops to ignore_home to allow mounts under / in Ubuntu.
  (LP: #459998)
* Add distccd to ignore_home to allow mount under / in Debian & Ubuntu.
* Revert previous changes, causes regression.
* Add kernoops to ignore_home to allow mounts under / in Ubuntu.
  (LP: #459998)
* Add distccd to ignore_home to allow mount under / in Debian & Ubuntu.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-30 12:47:03 +0000
3+++ debian/changelog 2011-03-31 21:43:27 +0000
4@@ -1,3 +1,26 @@
5+davfs2 (1.4.6-1ubuntu3) maverick-proposed; urgency=low
6+
7+ * Warn on misplaced configuration options, don't exit (LP: #746700)
8+ * Add kernoops to ignore_home to allow mounts under / in Ubuntu.
9+ (LP: #459998)
10+ * Add distccd to ignore_home to allow mount under / in Debian & Ubuntu.
11+
12+ -- Michael R. Crusoe <michael.crusoe@gmail.com> Thu, 31 Mar 2011 14:06:59 -0700
13+
14+davfs2 (1.4.6-1ubuntu2) natty; urgency=low
15+
16+ * Revert previous changes, causes regression.
17+
18+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 31 Mar 2011 21:36:49 +0200
19+
20+davfs2 (1.4.6-1ubuntu1) natty; urgency=low
21+
22+ * Add kernoops to ignore_home to allow mounts under / in Ubuntu.
23+ (LP: #459998)
24+ * Add distccd to ignore_home to allow mount under / in Debian & Ubuntu.
25+
26+ -- Michael R. Crusoe <michael.crusoe@gmail.com> Wed, 30 Mar 2011 14:42:35 +0200
27+
28 davfs2 (1.4.6-1ubuntu0.1) maverick-proposed; urgency=low
29
30 * Add distccd to ignore_home to allow mount under / in Debian & Ubuntu.
31@@ -245,7 +268,7 @@
32
33 -- Luciano Bello <luciano@linux.org.ar> Tue, 04 Oct 2005 15:02:01 -0300
34
35-davfs2 (0.2.4-1) unstable; urgency=high
36+davfs2 (0.2.4-1) unstable; urgency=high
37
38 * New upstream version 0.2.4.
39 - Solve CAN-2005-1774 .Permit users to mount their owns resources,
40
41=== modified file 'src/mount_davfs.c'
42--- src/mount_davfs.c 2010-05-09 02:20:30 +0000
43+++ src/mount_davfs.c 2011-03-31 21:43:27 +0000
44@@ -2174,18 +2174,33 @@
45
46 } else if (applies && count == 2) {
47
48- if (system && strcmp(parmv[0], "dav_user") == 0) {
49- if (args->dav_user)
50- free(args->dav_user);
51- args->dav_user = ne_strdup(parmv[1]);
52- } else if (system && strcmp(parmv[0], "dav_group") == 0) {
53- if (args->dav_group)
54- free(args->dav_group);
55- args->dav_group = ne_strdup(parmv[1]);
56- } else if (system && strcmp(parmv[0], "ignore_home") == 0) {
57- if (args->ignore_home)
58- free(args->ignore_home);
59- args->ignore_home = ne_strdup(parmv[1]);
60+ if (strcmp(parmv[0], "dav_user") == 0) {
61+ if (system) {
62+ if (args->dav_user)
63+ free(args->dav_user);
64+ args->dav_user = ne_strdup(parmv[1]);
65+ } else {
66+ error_at_line(0, 0, filename, lineno,
67+ _("system option in user configuration file"));
68+ }
69+ } else if (strcmp(parmv[0], "dav_group") == 0) {
70+ if (system) {
71+ if (args->dav_group)
72+ free(args->dav_group);
73+ args->dav_group = ne_strdup(parmv[1]);
74+ } else {
75+ error_at_line(0, 0, filename, lineno,
76+ _("system option in user configuration file"));
77+ }
78+ } else if (strcmp(parmv[0], "ignore_home") == 0) {
79+ if (system) {
80+ if (args->ignore_home)
81+ free(args->ignore_home);
82+ args->ignore_home = ne_strdup(parmv[1]);
83+ } else {
84+ error_at_line(0, 0, filename, lineno,
85+ _("system option in user configuration file"));
86+ }
87 } else if (strcmp(parmv[0], "kernel_fs") == 0) {
88 if (args->kernel_fs)
89 free(args->kernel_fs);
90@@ -2196,21 +2211,36 @@
91 if (args->servercert)
92 free(args->servercert);
93 args->servercert = ne_strdup(parmv[1]);
94- } else if (!system && strcmp(parmv[0], "secrets") == 0) {
95- if (args->secrets)
96- free(args->secrets);
97- args->secrets = ne_strdup(parmv[1]);
98+ } else if (strcmp(parmv[0], "secrets") == 0) {
99+ if (system) {
100+ error_at_line(0, 0, filename, lineno,
101+ _("user option in system configuration file"));
102+ } else {
103+ if (args->secrets)
104+ free(args->secrets);
105+ args->secrets = ne_strdup(parmv[1]);
106+ }
107 } else if (strcmp(parmv[0], "clientcert") == 0) {
108 if (args->clicert)
109 free(args->clicert);
110 args->clicert = ne_strdup(parmv[1]);
111- } else if (system && strcmp(parmv[0], "proxy") == 0) {
112- if (split_uri(NULL, &args->p_host, &args->p_port, NULL,
113- parmv[1]) != 0)
114- error_at_line(EXIT_FAILURE, 0, filename, lineno,
115- _("malformed line"));
116- } else if (system && strcmp(parmv[0], "use_proxy") == 0) {
117- args->useproxy = arg_to_int(parmv[1], 10, parmv[0]);
118+ } else if (strcmp(parmv[0], "proxy") == 0) {
119+ if (system) {
120+ if (split_uri(NULL, &args->p_host, &args->p_port, NULL,
121+ parmv[1]) != 0)
122+ error_at_line(EXIT_FAILURE, 0, filename, lineno,
123+ _("malformed line"));
124+ } else {
125+ error_at_line(0, 0, filename, lineno,
126+ _("system option in user configuration file"));
127+ }
128+ } else if (strcmp(parmv[0], "use_proxy") == 0) {
129+ if (system) {
130+ args->useproxy = arg_to_int(parmv[1], 10, parmv[0]);
131+ } else {
132+ error_at_line(0, 0, filename, lineno,
133+ _("system option in non-system config"));
134+ }
135 } else if (strcmp(parmv[0], "ask_auth") == 0) {
136 args->askauth = arg_to_int(parmv[1], 10, parmv[0]);
137 } else if (strcmp(parmv[0], "use_locks") == 0) {
138@@ -2249,14 +2279,24 @@
139 if (args->s_charset)
140 free(args->s_charset);
141 args->s_charset = ne_strdup(parmv[1]);
142- } else if (system && strcmp(parmv[0], "cache_dir") == 0) {
143- if (args->sys_cache)
144- free(args->sys_cache);
145- args->sys_cache = ne_strdup(parmv[1]);
146- } else if (!system && strcmp(parmv[0], "cache_dir") == 0) {
147- if (args->cache_dir != NULL)
148- free(args->cache_dir);
149- args->cache_dir = ne_strdup(parmv[1]);
150+ } else if (strcmp(parmv[0], "cache_dir") == 0) {
151+ if (system) {
152+ if (args->sys_cache)
153+ free(args->sys_cache);
154+ args->sys_cache = ne_strdup(parmv[1]);
155+ } else {
156+ error_at_line(0, 0, filename, lineno,
157+ _("system option in user configuration file"));
158+ }
159+ } else if (strcmp(parmv[0], "cache_dir") == 0) {
160+ if (system) {
161+ if (args->cache_dir != NULL)
162+ free(args->cache_dir);
163+ args->cache_dir = ne_strdup(parmv[1]);
164+ } else {
165+ error_at_line(0, 0, filename, lineno,
166+ _("user option in system configuration file"));
167+ }
168 } else if (strcmp(parmv[0], "backup_dir") == 0) {
169 if (args->backup_dir)
170 free(args->backup_dir);

Subscribers

People subscribed via source and target branches