On Apr 6, 2001, "John R. Jackson" <[EMAIL PROTECTED]> wrote:
>> The entry in the fstab looks good and looks like this on both
>> machines:
>> root_domain#root / advfs rw 1 0
> That would seem to be reasonable.
>> This was working fine in 2.4.2p1 but now that I have upgraded to
>> 2.4.2p2 its not working on any client or even the server anymore.
> OK, I can guess which pair of changes are involved. But since I
> don't have access to a system like this
I do. Yay! :-)
Here's a patch that fixes the bug. Obviously, the last hunk is enough
to fix the bug, but I'm posting exactly what I'm about to check in:
2.4.2 branch and mainline.
Index: ChangeLog
from Alexandre Oliva <[EMAIL PROTECTED]>
* client-src/getfsent.c (search_fstab): Don't skip entry just
because device stats failed.
Index: client-src/getfsent.c
===================================================================
RCS file: /cvsroot/amanda/amanda/client-src/getfsent.c,v
retrieving revision 1.20.4.2
diff -u -p -r1.20.4.2 getfsent.c
--- client-src/getfsent.c 2001/03/30 02:40:21 1.20.4.2
+++ client-src/getfsent.c 2001/04/09 01:56:54
@@ -1,6 +1,6 @@
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 1991-1998, 2001 University of Maryland at College Park
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -428,8 +428,8 @@ struct stat stats[3], *estat;
}
int search_fstab(name, fsent)
-char *name;
-generic_fsent_t *fsent;
+ char *name;
+ generic_fsent_t *fsent;
{
struct stat stats[3];
char *fullname = NULL;
@@ -476,8 +476,8 @@ generic_fsent_t *fsent;
if(fsent->fsname != NULL) {
sfs = stat(fsent->fsname, &fsstat);
sfsr = stat((rdev = dev2rdev(fsent->fsname)), &fsrstat);
- if(sfs == -1 && sfsr == -1)
- continue;
+ /* We don't want to `continue;' even if both sfs and sfsr are
+ -1, because, if we get here, at least smnt is not -1. */
}
if((fsent->mntdir != NULL &&
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist *Please* write to mailing lists, not to me