1 Only in coda-6.0.5-new/autom4te.cache: output.1t
2 Only in coda-6.0.5-new/autom4te.cache: traces.1t
3 diff -ur coda-6.0.5/coda-src/al/altest.c coda-6.0.5-new/coda-src/al/altest.c
4 --- coda-6.0.5/coda-src/al/altest.c 2003-11-21 14:49:52.000000000 -0700
5 +++ coda-6.0.5-new/coda-src/al/altest.c 2004-04-02 23:43:00.542847046 -0700
7 /* Load configuration file to get vice dir. */
8 codaconf_init("server.conf");
10 - CODACONF_STR(vicedir, "vicedir", "/vice");
11 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
13 vice_dir_init(vicedir, 0);
15 Only in coda-6.0.5-new/coda-src/al: altest.c~
16 Only in coda-6.0.5-new/coda-src/al: altest.c.orig
17 diff -ur coda-6.0.5/coda-src/al/pdbtool.c coda-6.0.5-new/coda-src/al/pdbtool.c
18 --- coda-6.0.5/coda-src/al/pdbtool.c 2004-03-05 14:17:25.000000000 -0700
19 +++ coda-6.0.5-new/coda-src/al/pdbtool.c 2004-04-02 23:43:24.657481001 -0700
21 /* Load server.conf configuration file to get vice dir. */
22 codaconf_init("server.conf");
24 - CODACONF_STR(vicedir, "vicedir", "/vice");
25 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
27 vice_dir_init(vicedir, 0);
29 Only in coda-6.0.5-new/coda-src/al: pdbtool.c~
30 Only in coda-6.0.5-new/coda-src/al: pdbtool.c.orig
31 diff -ur coda-6.0.5/coda-src/auth2/auth2.c coda-6.0.5-new/coda-src/auth2/auth2.c
32 --- coda-6.0.5/coda-src/auth2/auth2.c 2003-11-21 14:49:55.000000000 -0700
33 +++ coda-6.0.5-new/coda-src/auth2/auth2.c 2004-04-02 23:43:43.832804410 -0700
35 /* Load configuration file to get vice dir. */
36 codaconf_init("server.conf");
38 - CODACONF_STR(vicedir, "vicedir", "/vice");
39 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
41 vice_dir_init(vicedir, 0);
43 Only in coda-6.0.5-new/coda-src/auth2: auth2.c~
44 Only in coda-6.0.5-new/coda-src/auth2: auth2.c.orig
45 diff -ur coda-6.0.5/coda-src/norton/norton.cc coda-6.0.5-new/coda-src/norton/norton.cc
46 --- coda-6.0.5/coda-src/norton/norton.cc 2003-05-23 12:26:36.000000000 -0600
47 +++ coda-6.0.5-new/coda-src/norton/norton.cc 2004-04-02 23:42:19.786536022 -0700
52 - vice_dir_init("/vice", ServerNumber);
53 + vice_dir_init("/var/lib/coda/vice", ServerNumber);
54 NortonInit(argv[0], argv[1], atoi(argv[2]));
57 Only in coda-6.0.5-new/coda-src/norton: norton.cc.orig
58 diff -ur coda-6.0.5/coda-src/norton/norton-reinit.cc coda-6.0.5-new/coda-src/norton/norton-reinit.cc
59 --- coda-6.0.5/coda-src/norton/norton-reinit.cc 2003-07-23 15:41:20.000000000 -0600
60 +++ coda-6.0.5-new/coda-src/norton/norton-reinit.cc 2004-04-02 23:42:19.785536161 -0700
62 data_len = atoi(argv[4]);
65 - vice_dir_init("/vice", 0);
66 + vice_dir_init("/var/lib/coda/vice", 0);
69 if (strcmp(argv[7], "skip")) {
70 diff -ur coda-6.0.5/coda-src/portmapper/rpc2portmap.c coda-6.0.5-new/coda-src/portmapper/rpc2portmap.c
71 --- coda-6.0.5/coda-src/portmapper/rpc2portmap.c 2003-11-21 14:49:56.000000000 -0700
72 +++ coda-6.0.5-new/coda-src/portmapper/rpc2portmap.c 2004-04-02 23:44:04.617903119 -0700
74 /* Load configuration file to get vice dir. */
75 codaconf_init("server.conf");
77 - CODACONF_STR(vicedir, "vicedir", "/vice");
78 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
80 vice_dir_init(vicedir, 0);
82 Only in coda-6.0.5-new/coda-src/portmapper: rpc2portmap.c~
83 Only in coda-6.0.5-new/coda-src/portmapper: rpc2portmap.c.orig
84 diff -ur coda-6.0.5/coda-src/scripts/bldvldb.sh.in coda-6.0.5-new/coda-src/scripts/bldvldb.sh.in
85 --- coda-6.0.5/coda-src/scripts/bldvldb.sh.in 2004-03-05 14:12:44.000000000 -0700
86 +++ coda-6.0.5-new/coda-src/scripts/bldvldb.sh.in 2004-04-02 23:42:19.949513273 -0700
90 if [ x${vicedir} = x ] ; then
92 + vicedir=/var/lib/coda/vice
95 THISHOST=`hostname | tr A-Z a-z`
96 Only in coda-6.0.5-new/coda-src/scripts: bldvldb.sh.in.orig
97 diff -ur coda-6.0.5/coda-src/scripts/createvol_rep.in coda-6.0.5-new/coda-src/scripts/createvol_rep.in
98 --- coda-6.0.5/coda-src/scripts/createvol_rep.in 2004-03-05 14:12:44.000000000 -0700
99 +++ coda-6.0.5-new/coda-src/scripts/createvol_rep.in 2004-04-02 23:44:24.760091569 -0700
103 # load the server configuration file
105 +vicedir=/var/lib/coda/vice
106 . "`@sbindir@/codaconfedit server.conf`"
108 if [ ! -f ${vicedir}/hostname -o ! -f ${vicedir}/db/scm ] ; then
109 Only in coda-6.0.5-new/coda-src/scripts: createvol_rep.in~
110 Only in coda-6.0.5-new/coda-src/scripts: createvol_rep.in.orig
111 diff -ur coda-6.0.5/coda-src/scripts/rc.vice.in coda-6.0.5-new/coda-src/scripts/rc.vice.in
112 --- coda-6.0.5/coda-src/scripts/rc.vice.in 2001-04-11 07:08:01.000000000 -0600
113 +++ coda-6.0.5-new/coda-src/scripts/rc.vice.in 2004-04-02 23:42:20.010504759 -0700
117 if [ x${vicedir} = x ]; then
119 + vicedir=/var/lib/coda/vice
122 if [ x${numservers} = x ]; then
123 diff -ur coda-6.0.5/coda-src/scripts/startserver.in coda-6.0.5-new/coda-src/scripts/startserver.in
124 --- coda-6.0.5/coda-src/scripts/startserver.in 2003-06-01 17:12:56.000000000 -0600
125 +++ coda-6.0.5-new/coda-src/scripts/startserver.in 2004-04-02 23:42:20.011504620 -0700
129 if [ x${vicedir} = x ]; then
131 + vicedir=/var/lib/coda/vice
134 if [ -f ${vicedir}/srv/pid ]; then
135 Only in coda-6.0.5-new/coda-src/scripts: startserver.in.orig
136 diff -ur coda-6.0.5/coda-src/scripts/vice-setup.in coda-6.0.5-new/coda-src/scripts/vice-setup.in
137 --- coda-6.0.5/coda-src/scripts/vice-setup.in 2004-03-05 14:12:44.000000000 -0700
138 +++ coda-6.0.5-new/coda-src/scripts/vice-setup.in 2004-04-02 23:42:20.106491361 -0700
139 @@ -109,12 +109,12 @@
143 -echon "What is the root directory for your coda server(s)? [/vice] "
144 +echon "What is the root directory for your coda server(s)? [/var/lib/coda/vice] "
148 if [ "x$vicedir" = x ] ; then
150 + vicedir=/var/lib/coda/vice
153 if [ $mkconf = 1 ] ; then
154 Only in coda-6.0.5-new/coda-src/scripts: vice-setup.in.orig
155 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-rvm.in coda-6.0.5-new/coda-src/scripts/vice-setup-rvm.in
156 --- coda-6.0.5/coda-src/scripts/vice-setup-rvm.in 2004-03-05 14:12:44.000000000 -0700
157 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-rvm.in 2004-04-02 23:42:20.042500293 -0700
161 # defaults, will be overridden by settings in the server.conf file
163 +vicedir=/var/lib/coda/vice
165 exec_prefix=@exec_prefix@
166 conf="`@sbindir@/codaconfedit server.conf`"
167 Only in coda-6.0.5-new/coda-src/scripts: vice-setup-rvm.in.orig
168 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-scm coda-6.0.5-new/coda-src/scripts/vice-setup-scm
169 --- coda-6.0.5/coda-src/scripts/vice-setup-scm 2003-05-23 12:26:52.000000000 -0600
170 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-scm 2004-04-02 23:42:20.072496106 -0700
172 . "`codaconfedit server.conf`"
174 if [ x${vicedir} = x ] ; then
176 + vicedir=/var/lib/coda/vice
179 # current first maximum replicated volume id
180 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-srvdir coda-6.0.5-new/coda-src/scripts/vice-setup-srvdir
181 --- coda-6.0.5/coda-src/scripts/vice-setup-srvdir 2003-06-02 21:33:55.000000000 -0600
182 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-srvdir 2004-04-02 23:42:20.073495966 -0700
188 +vicedir=/var/lib/coda/vice
190 . "`codaconfedit server.conf`"
195 if [ $numservers -gt 1 ]; then
196 - echon "Where shall we store your file data for server $n ($bn) [/vicepa]? "
197 + echon "Where shall we store your file data for server $n ($bn) [/var/lib/coda/vicepa]? "
199 - echon 'Where shall we store your file data [/vicepa]? '
200 + echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
205 if [ "x$srvdir" = x ]; then
207 + srvdir=/var/lib/coda/vicepa
210 # Create the directory if needed. (Symlink is OK.)
211 Only in coda-6.0.5-new/coda-src/scripts: vice-setup-srvdir.orig
212 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-user coda-6.0.5-new/coda-src/scripts/vice-setup-user
213 --- coda-6.0.5/coda-src/scripts/vice-setup-user 2003-05-23 12:26:52.000000000 -0600
214 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-user 2004-04-02 23:42:20.104491640 -0700
220 +vicedir=/var/lib/coda/vice
221 . "`codaconfedit server.conf`"
223 # Set up password and group files for Coda
224 diff -ur coda-6.0.5/coda-src/update/updateclnt.cc coda-6.0.5-new/coda-src/update/updateclnt.cc
225 --- coda-6.0.5/coda-src/update/updateclnt.cc 2003-11-21 14:49:57.000000000 -0700
226 +++ coda-6.0.5-new/coda-src/update/updateclnt.cc 2004-04-02 23:44:48.664754833 -0700
228 /* Load configuration file to get vice dir. */
229 codaconf_init("server.conf");
231 - CODACONF_STR(vicedir, "vicedir", "/vice");
232 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
233 CODACONF_INT(nservers, "numservers", 1);
235 vice_dir_init(vicedir, 0);
236 Only in coda-6.0.5-new/coda-src/update: updateclnt.cc~
237 Only in coda-6.0.5-new/coda-src/update: updateclnt.cc.orig
238 diff -ur coda-6.0.5/coda-src/update/updatefetch.cc coda-6.0.5-new/coda-src/update/updatefetch.cc
239 --- coda-6.0.5/coda-src/update/updatefetch.cc 2003-11-21 14:49:57.000000000 -0700
240 +++ coda-6.0.5-new/coda-src/update/updatefetch.cc 2004-04-02 23:45:13.171334078 -0700
242 /* Load configuration file to get vice dir. */
243 codaconf_init("server.conf");
245 - CODACONF_STR(vicedir, "vicedir", "/vice");
246 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
247 CODACONF_INT(nservers, "numservers", 1);
249 vice_dir_init(vicedir, 0);
250 Only in coda-6.0.5-new/coda-src/update: updatefetch.cc~
251 Only in coda-6.0.5-new/coda-src/update: updatefetch.cc.orig
252 diff -ur coda-6.0.5/coda-src/update/updatesrv.cc coda-6.0.5-new/coda-src/update/updatesrv.cc
253 --- coda-6.0.5/coda-src/update/updatesrv.cc 2003-11-21 14:49:57.000000000 -0700
254 +++ coda-6.0.5-new/coda-src/update/updatesrv.cc 2004-04-02 23:45:35.348238511 -0700
256 /* Load configuration file to get vice dir. */
257 codaconf_init("server.conf");
259 - CODACONF_STR(vicedir, "vicedir", "/vice");
260 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
262 vice_dir_init(vicedir, 0);
264 Only in coda-6.0.5-new/coda-src/update: updatesrv.cc~
265 Only in coda-6.0.5-new/coda-src/update: updatesrv.cc.orig
266 diff -ur coda-6.0.5/coda-src/vice/printvrdb.cc coda-6.0.5-new/coda-src/vice/printvrdb.cc
267 --- coda-6.0.5/coda-src/vice/printvrdb.cc 2003-11-21 14:49:58.000000000 -0700
268 +++ coda-6.0.5-new/coda-src/vice/printvrdb.cc 2004-04-02 23:45:59.235904148 -0700
270 /* Load configuration file to get vice dir. */
271 codaconf_init("server.conf");
273 - CODACONF_STR(vicedir, "vicedir", "/vice");
274 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
276 vice_dir_init(vicedir, 0);
278 Only in coda-6.0.5-new/coda-src/vice: printvrdb.cc~
279 Only in coda-6.0.5-new/coda-src/vice: printvrdb.cc.orig
280 diff -ur coda-6.0.5/coda-src/vice/server.conf.ex coda-6.0.5-new/coda-src/vice/server.conf.ex
281 --- coda-6.0.5/coda-src/vice/server.conf.ex 2003-02-28 00:32:28.000000000 -0700
282 +++ coda-6.0.5-new/coda-src/vice/server.conf.ex 2004-04-02 23:42:20.390451724 -0700
285 # Prefix of server tree
288 +#vicedir=/var/lib/coda/vice
291 # Should the server use private mmaps for RVM
292 diff -ur coda-6.0.5/coda-src/vice/srv.cc coda-6.0.5-new/coda-src/vice/srv.cc
293 --- coda-6.0.5/coda-src/vice/srv.cc 2003-11-21 14:49:59.000000000 -0700
294 +++ coda-6.0.5-new/coda-src/vice/srv.cc 2004-04-02 23:47:00.177397620 -0700
295 @@ -1272,7 +1272,7 @@
296 CODACONF_INT(large, "large", 500);
297 CODACONF_INT(small, "small", 500);
299 - CODACONF_STR(vicedir, "vicedir", "/vice");
300 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
301 vice_dir_init(vicedir, ServerNumber);
303 CODACONF_INT(trace, "trace", 0);
304 Only in coda-6.0.5-new/coda-src/vice: srv.cc~
305 Only in coda-6.0.5-new/coda-src/vice: srv.cc.orig
306 diff -ur coda-6.0.5/coda-src/vol/testvrdb.cc coda-6.0.5-new/coda-src/vol/testvrdb.cc
307 --- coda-6.0.5/coda-src/vol/testvrdb.cc 2003-05-23 12:27:33.000000000 -0600
308 +++ coda-6.0.5-new/coda-src/vol/testvrdb.cc 2004-04-02 23:42:20.481439024 -0700
310 sprintf (confname, "%s.conf", serverconf);
311 (void) conf_init(confname);
313 - CONF_STR(vicedir, "vicedir", "/vice");
314 + CONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
316 vice_dir_init(vicedir, 0);
318 diff -ur coda-6.0.5/coda-src/volutil/backup.cc coda-6.0.5-new/coda-src/volutil/backup.cc
319 --- coda-6.0.5/coda-src/volutil/backup.cc 2003-11-21 14:49:59.000000000 -0700
320 +++ coda-6.0.5-new/coda-src/volutil/backup.cc 2004-04-02 23:47:14.826352843 -0700
322 /* Load configuration file to get vice dir. */
323 codaconf_init("server.conf");
325 - CODACONF_STR(vicedir, "vicedir", "/vice");
326 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
328 vice_dir_init(vicedir, 0);
330 Only in coda-6.0.5-new/coda-src/volutil: backup.cc~
331 Only in coda-6.0.5-new/coda-src/volutil: backup.cc.orig
332 diff -ur coda-6.0.5/coda-src/volutil/volclient.cc coda-6.0.5-new/coda-src/volutil/volclient.cc
333 --- coda-6.0.5/coda-src/volutil/volclient.cc 2004-02-26 21:12:10.000000000 -0700
334 +++ coda-6.0.5-new/coda-src/volutil/volclient.cc 2004-04-02 23:47:30.425175479 -0700
336 /* Load configuration file to get vice dir. */
337 codaconf_init("server.conf");
339 - CODACONF_STR(vicedir, "vicedir", "/vice");
340 + CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
341 CODACONF_INT(nservers, "numservers", 1);
343 vice_dir_init(vicedir, 0);
344 Only in coda-6.0.5-new/coda-src/volutil: volclient.cc~
345 Only in coda-6.0.5-new/coda-src/volutil: volclient.cc.orig