cannot readd locally, next try

This commit is contained in:
sturm 2007-10-28 18:32:14 +00:00
parent 0c05cdcb96
commit d52c59c6e3
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_do_c,v 1.7 2007/10/28 18:32:14 sturm Exp $
--- src/do.c.orig Sun Sep 2 16:14:43 2007
+++ src/do.c Sun Sep 2 16:20:28 2007
@@ -3278,7 +3278,7 @@ if (MatchStringInFstab(mountpt))
CfLog(cfinform,"---------------------------------------------------","");
/* delete current fstab entry and unmount if necessary */
- snprintf(mountspec,CF_BUFSIZE,".+:%s",mountpt);
+ snprintf(mountspec,MAXPATHLEN,".+:%s",mountpt);
mntentry = LocateItemContainingRegExp(VMOUNTED,mountspec);
if (mntentry)
{
@@ -3287,7 +3287,7 @@ if (MatchStringInFstab(mountpt))
strcat(mountspec,mountpt);
}
else /* mountpt isn't mounted, so Unmount can use dummy host name */
- snprintf(mountspec,CF_BUFSIZE,"host:%s",mountpt);
+ snprintf(mountspec,MAXPATHLEN,"host:%s",mountpt);
/* delete current fstab entry and unmount if necessary (don't rmdir) */
cleaner.name = mountspec;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_misc_c,v 1.7 2007/10/28 18:32:14 sturm Exp $
--- src/misc.c.orig Sun Sep 2 16:36:12 2007
+++ src/misc.c Sun Sep 2 16:36:28 2007
@@ -272,7 +272,7 @@ else if (pid == 0) /* child */
{
if (useshell)
{
- if (execl("/bin/sh","sh","-c",comm,NULL) == -1)
+ if (execl("/bin/sh","sh","-c",comm,(void *)NULL) == -1)
{
yyerror("script failed");
perror("execl");