update to cfengine 2.1.7p1

from maintainer William Yodlowsky <bsd at openbsd.rutgers.edu>
This commit is contained in:
sturm 2004-08-08 14:02:11 +00:00
parent d89df361c8
commit 221fb97e5d
29 changed files with 425 additions and 406 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.16 2004/06/17 11:21:42 sturm Exp $
# $OpenBSD: Makefile,v 1.17 2004/08/08 14:02:11 sturm Exp $
COMMENT= "GNU system administration tool for networks"
DISTNAME= cfengine-2.1.6
DISTNAME= cfengine-2.1.7p1
CATEGORIES= sysutils
HOMEPAGE= http://www.cfengine.org/

View File

@ -1,3 +1,3 @@
MD5 (cfengine-2.1.6.tar.gz) = 7b6ca6339d0dd6bdcaa3dd2765dd3d08
RMD160 (cfengine-2.1.6.tar.gz) = ffce455311c5df2bb2585736e59192ad7a6f4e06
SHA1 (cfengine-2.1.6.tar.gz) = bdcad92039ed479f59978b5709c42e0e2ebb03f5
MD5 (cfengine-2.1.7p1.tar.gz) = 8b9970278f131985fa9c5bc368e51a0d
RMD160 (cfengine-2.1.7p1.tar.gz) = f553276ee4fa532c4a459b0e5d4021b1da66cadc
SHA1 (cfengine-2.1.7p1.tar.gz) = 1632ce3522ded45c1bf04187313741fbe59fd9ba

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
--- src/cfagent.c.orig Sat Apr 17 16:10:58 2004
+++ src/cfagent.c Thu Jun 17 12:54:38 2004
@@ -214,7 +214,7 @@ void Initialize(int argc,char *argv[])
$OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/cfagent.c.orig Wed Jun 23 17:58:01 2004
+++ src/cfagent.c Mon Aug 2 13:30:32 2004
@@ -217,7 +217,7 @@ void Initialize(int argc,char *argv[])
unsigned char s[16];
char ebuff[CF_EXPANDSIZE];
@ -9,17 +9,17 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
+(void)strlcpy(VDOMAIN,CF_START_DOMAIN,sizeof(VDOMAIN));
PreLockState();
SetSignals();
@@ -229,7 +229,7 @@ VDEFAULTROUTE[0] = '\0';
@@ -231,7 +231,7 @@ VDEFAULTROUTE[0] = '\0';
ALLCLASSBUFFER[0] = '\0';
VREPOSITORY = strdup("\0");
-strcpy(METHODNAME,"cf-nomethod");
+(void)strlcpy(METHODNAME,"cf-nomethod",sizeof(METHODNAME));
METHODREPLYTO[0] = '\0';
METHODFOR[0] = '\0';
METHODRETURNVARS[0] = '\0';
METHODRETURNCLASSES[0] = '\0';
@@ -238,8 +238,8 @@ METHODRETURNCLASSES[0] = '\0';
@@ -241,8 +241,8 @@ METHODRETURNCLASSES[0] = '\0';
re_syntax_options |= RE_INTERVALS;
#endif
@ -30,7 +30,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
IDClasses();
@@ -280,7 +280,7 @@ for (i = 1; i < argc; i++)
@@ -283,15 +283,15 @@ for (i = 1; i < argc; i++)
VIFELAPSED = VDEFAULTIFELAPSED;
TRAVLINKS = false;
@ -39,7 +39,6 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if (stat(ebuff,&statbuf) == -1)
{
@@ -287,8 +287,8 @@ for (i = 1; i < argc; i++)
CreateEmptyFile(ebuff);
}
@ -50,7 +49,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -317,8 +317,8 @@ if (NOPRECONFIG)
@@ -320,8 +320,8 @@ if (NOPRECONFIG)
return;
}
@ -61,7 +60,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
@@ -605,8 +605,8 @@ if (strlen(ebuff) != 0)
@@ -608,8 +608,8 @@ if (strlen(ebuff) != 0)
}
else
{
@ -71,8 +70,8 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
+ (void)strlcat(VPREFIX,VUQNAME,40);
}
@@ -744,7 +744,7 @@ if (VACTIONSEQ == NULL)
p2 = SortItemListNames(VHEAP);
@@ -750,7 +750,7 @@ if (VACTIONSEQ == NULL)
Warning("perhaps cfagent.conf/update.conf have not yet been set up?");
}
@ -81,7 +80,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if (VACCESSLIST != NULL && !IsItemIn(VACCESSLIST,id))
{
@@ -888,7 +888,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
@@ -900,7 +900,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
if (GetMacroValue(CONTEXTID,"BinaryPaddingChar"))
{
@ -90,7 +89,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if (ebuff[0] == '\\')
{
@@ -1066,7 +1066,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
@@ -1078,7 +1078,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
CFSTARTTIME = tloc;
@ -99,7 +98,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
Verbose("Reference time set to %s\n",ctime(&tloc));
@@ -1429,7 +1429,7 @@ while (*sp != '\0')
@@ -1441,7 +1441,7 @@ while (*sp != '\0')
{
VIFELAPSED = VDEFAULTIFELAPSED;
VEXPIREAFTER = VDEFAULTEXPIREAFTER;
@ -108,7 +107,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
continue;
}
else
@@ -1828,8 +1828,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
@@ -1841,8 +1841,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
{
size++; /* Allow for : separator */
}
@ -119,7 +118,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
}
}
@@ -1848,8 +1848,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
@@ -1861,8 +1861,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
size++; /* Allow for : separator */
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
--- src/cfenvd.c.orig Mon Apr 19 11:41:05 2004
+++ src/cfenvd.c Thu Jun 17 12:54:38 2004
$OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/cfenvd.c.orig Fri Jun 18 06:43:37 2004
+++ src/cfenvd.c Mon Aug 2 13:30:33 2004
@@ -188,10 +188,10 @@ void CheckOptsAndInit(int argc,char **ar
int c, i,j,k;
@ -14,7 +14,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
IGNORELOCK = false;
OUTPUT[0] = '\0';
@@ -242,9 +242,9 @@ while ((c=getopt_long(argc,argv,"d:vhHFV
@@ -242,18 +242,18 @@ while ((c=getopt_long(argc,argv,"d:vhHFV
LOGGING = true; /* Do output to syslog */
@ -26,7 +26,6 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
MakeDirectoriesFor(VBUFF,'y');
strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
@@ -251,9 +251,9 @@ strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
for (i = 0; i < ATTR; i++)
{
@ -66,7 +65,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
CfLog(cfinform,OUTPUT,"");
exit(0);
}
@@ -618,7 +618,7 @@ if ((now = time((time_t *)NULL)) == -1)
@@ -625,7 +625,7 @@ if ((now = time((time_t *)NULL)) == -1)
exit(1);
}
@ -75,7 +74,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
return ConvTimeKey(str);
}
@@ -784,14 +784,14 @@ SetVariable("loadavg",LOADAVG,av.expect_
@@ -791,14 +791,14 @@ SetVariable("loadavg",LOADAVG,av.expect_
for (i = 0; i < ATTR; i++)
{
char name[256];
@ -94,7 +93,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
sig = SetClasses(name,OUTGOING[i],av.expect_outgoing[i],av.var_outgoing[i],LOCALAV.expect_outgoing[i],LOCALAV.var_outgoing[i],&classlist,timekey);
SetVariable(name,OUTGOING[i],av.expect_outgoing[i],sig,&classlist);
@@ -811,13 +811,13 @@ for (i = 0; i < PH_LIMIT; i++)
@@ -818,13 +818,13 @@ for (i = 0; i < PH_LIMIT; i++)
for (i = 0; i < CF_NETATTR; i++)
{
char name[256];
@ -112,7 +111,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
sig = SetClasses(name,NETOUT[i],av.expect_netout[i],av.var_netout[i],LOCALAV.expect_netout[i],LOCALAV.var_netout[i],&classlist,timekey);
SetVariable(name,NETOUT[i],av.expect_netout[i],sig,&classlist);
}
@@ -1135,7 +1135,7 @@ if (ALL_OUTGOING != NULL)
@@ -1142,7 +1142,7 @@ if (ALL_OUTGOING != NULL)
sscanf(VNETSTAT[VSYSTEMHARDCLASS],"%s",comm);
@ -121,7 +120,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((pp = cfpopen(comm,"r")) == NULL)
{
@@ -1466,7 +1466,7 @@ struct Averages *GetCurrentAverages(char
@@ -1473,7 +1473,7 @@ struct Averages *GetCurrentAverages(char
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -130,7 +129,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1477,7 +1477,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1484,7 +1484,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -139,7 +138,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1527,7 +1527,7 @@ void UpdateAverages(char *timekey,struct
@@ -1534,7 +1534,7 @@ void UpdateAverages(char *timekey,struct
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -148,7 +147,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1538,7 +1538,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1545,7 +1545,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -157,7 +156,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1765,19 +1765,19 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1772,27 +1772,27 @@ if (fabs(delta) < cf_noise_threshold) /*
Debug(" Sensitivity too high ..\n");
buffer[0] = '\0';
@ -181,7 +180,6 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
}
dev = sqrt(delta*delta/(1.0+sigma*sigma)+ldelta*ldelta/(1.0+lsigma*lsigma));
@@ -1784,8 +1784,8 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev > 2.0*sqrt(2.0))
{
@ -192,7 +190,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
AppendItem(classlist,buffer2,"2");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1795,19 +1795,19 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1802,33 +1802,33 @@ if (fabs(delta) < cf_noise_threshold) /*
else
{
buffer[0] = '\0';
@ -216,7 +214,6 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
}
dev = sqrt(delta*delta/(1.0+sigma*sigma)+ldelta*ldelta/(1.0+lsigma*lsigma));
@@ -1814,14 +1814,14 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev <= sqrt(2.0))
{
@ -235,7 +232,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
AppendItem(classlist,buffer2,"0");
}
@@ -1831,8 +1831,8 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1838,16 +1838,16 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev > 2.0*sqrt(2.0))
{
@ -246,7 +243,6 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
AppendItem(classlist,buffer2,"2");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1839,8 +1839,8 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev > 3.0*sqrt(2.0))
{
@ -257,7 +253,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
AppendItem(classlist,buffer2,"3");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1855,13 +1855,13 @@ void SetVariable(char *name,double value
@@ -1862,13 +1862,13 @@ void SetVariable(char *name,double value
{ char var[CF_BUFSIZE];

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
--- src/cfenvgraph.c.orig Mon Apr 19 12:00:16 2004
+++ src/cfenvgraph.c Thu Jun 17 12:54:38 2004
$OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/cfenvgraph.c.orig Fri May 7 11:44:59 2004
+++ src/cfenvgraph.c Mon Aug 2 13:30:33 2004
@@ -171,7 +171,7 @@ fgets(line,CF_BUFSIZE,pp);
fgets(line,CF_BUFSIZE,pp);
line[0] = '\0';
@ -101,7 +101,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPLOAD = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -636,7 +636,7 @@ if (SEPARATE)
@@ -636,14 +636,14 @@ if (SEPARATE)
for (i = 0; i < ATTR; i++)
{
@ -110,7 +110,6 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPIN[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -643,7 +643,7 @@ if (SEPARATE)
exit(1);
}
@ -119,7 +118,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPOUT[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -653,7 +653,7 @@ if (SEPARATE)
@@ -653,14 +653,14 @@ if (SEPARATE)
for (i = 0; i < CF_NETATTR; i++)
{
@ -128,7 +127,6 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPNETIN[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -660,7 +660,7 @@ if (SEPARATE)
exit(1);
}
@ -201,7 +199,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPLOAD = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1107,7 +1107,7 @@ for (i = 0; i < 7; i++)
@@ -1107,14 +1107,14 @@ for (i = 0; i < 7; i++)
for (i = 0; i < ATTR; i++)
{
@ -210,7 +208,6 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.1 2004/06/17 11:21:42 sturm Exp $
if ((FPIN[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1114,7 +1114,7 @@ for (i = 0; i < 7; i++)
exit(1);
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/cfexecd.c.orig Sat Apr 17 16:11:14 2004
+++ src/cfexecd.c Thu Jun 17 12:54:38 2004
$OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/cfexecd.c.orig Tue May 11 03:15:34 2004
+++ src/cfexecd.c Mon Aug 2 13:32:38 2004
@@ -143,7 +143,7 @@ Banner("Check options");
NOSPLAY = false;
@ -51,7 +51,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug("Got IP (%s)\n",VIPADDRESS);
if ((ungetc(fgetc(pp), pp)) != '[')
@@ -909,7 +909,7 @@ if (!Dialogue(sd,NULL))
@@ -909,21 +909,21 @@ if (!Dialogue(sd,NULL))
goto mail_err;
}
@ -60,7 +60,6 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (!Dialogue(sd,VBUFF))
{
@@ -916,7 +916,7 @@ sprintf(VBUFF,"HELO %s\r\n",VFQNAME);
goto mail_err;
}
@ -69,7 +68,6 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (!Dialogue(sd,VBUFF))
{
@@ -923,7 +923,7 @@ if (!Dialogue(sd,VBUFF))
goto mail_err;
}
@ -78,7 +76,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (!Dialogue(sd,VBUFF))
{
@@ -937,18 +937,18 @@ if (!Dialogue(sd,"DATA\r\n"))
@@ -937,11 +937,11 @@ if (!Dialogue(sd,"DATA\r\n"))
if (anomaly)
{
@ -92,7 +90,10 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
sent=send(sd,VBUFF,strlen(VBUFF),0);
@@ -952,9 +952,9 @@ sent=send(sd,VBUFF,strlen(VBUFF),0);
strftime(VBUFF,CF_BUFSIZE,"Date: %a, %d %b %Y %H:%M:%S %z\r\n",localtime(&now));
sent=send(sd,VBUFF,strlen(VBUFF),0);
-sprintf(VBUFF,"From: cfengine@%s\r\n",VFQNAME);
+(void)snprintf(VBUFF,sizeof(VBUFF),"From: cfengine@%s\r\n",VFQNAME);
sent=send(sd,VBUFF,strlen(VBUFF),0);
@ -101,7 +102,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sent=send(sd,VBUFF,strlen(VBUFF),0);
while(!feof(fp))
@@ -958,13 +958,13 @@ while(!feof(fp))
@@ -964,13 +964,13 @@ while(!feof(fp))
if (strlen(VBUFF) > 0)
{
VBUFF[strlen(VBUFF)-1] = '\r';
@ -117,7 +118,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sent=send(sd,VBUFF,strlen(VBUFF),0);
break;
}
@@ -985,7 +985,7 @@ mail_err:
@@ -991,7 +991,7 @@ mail_err:
fclose(fp);
close(sd);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cflex_l_in,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/cflex.l.in.orig 2004-06-12 22:55:29.000000000 -0400
+++ src/cflex.l.in 2004-06-12 22:56:13.000000000 -0400
@@ -224,7 +224,7 @@ editfiles: {
$OpenBSD: patch-src_cflex_l_in,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/cflex.l.in.orig Mon Jun 7 14:44:12 2004
+++ src/cflex.l.in Mon Aug 2 13:30:33 2004
@@ -235,7 +235,7 @@ editfiles: {
{lforcearrow} {
Debug1("LFARROW %s\n",yytext);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_cflex_l_in,v 1.1 2004/06/17 11:21:43 sturm Exp $
ACTION_IS_LINKCHILDREN = true;
FORCELINK='y';
return LARROW;
@@ -233,7 +233,7 @@ editfiles: {
@@ -244,7 +244,7 @@ editfiles: {
{forcearrow} {
Debug1("FARROW %s\n",yytext);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_cflex_l_in,v 1.1 2004/06/17 11:21:43 sturm Exp $
ACTION_IS_LINK = true;
FORCELINK='y';
return ARROW;
@@ -241,7 +241,7 @@ editfiles: {
@@ -252,7 +252,7 @@ editfiles: {
{arrow} {
Debug1("ARROW %s\n",yytext);
@ -28,7 +28,7 @@ $OpenBSD: patch-src_cflex_l_in,v 1.1 2004/06/17 11:21:43 sturm Exp $
ACTION_IS_LINK = true;
FORCELINK='n';
return ARROW;
@@ -250,7 +250,7 @@ editfiles: {
@@ -261,7 +261,7 @@ editfiles: {
{larrow} {
Debug1("LARROW %s\n",yytext);

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/do.c.orig Sat Apr 17 16:10:55 2004
+++ src/do.c Thu Jun 17 12:54:38 2004
$OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/do.c.orig Wed Jun 9 08:50:19 2004
+++ src/do.c Mon Aug 2 13:35:37 2004
@@ -76,9 +76,9 @@ for (ip = VMOUNTLIST; ip != NULL; ip=ip-
continue;
}
@ -261,7 +261,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
DeleteItemContaining(&filelist,VBUFF);
}
else
@@ -2584,7 +2586,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2585,14 +2587,14 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
#ifdef NT
tzset();
@ -270,7 +270,6 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
#else
#ifndef AOS
@@ -2591,7 +2593,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
#ifndef SUN4
tzset();
@ -279,7 +278,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
#else
@@ -2599,7 +2601,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2600,7 +2602,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
{
printf("Couldn't read system clock\n\n");
}
@ -288,7 +287,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
#endif /* SUN4 */
#endif /* AOS */
@@ -2839,14 +2841,14 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2840,14 +2842,14 @@ if (S_ISDIR(statbuf.st_mode))
filecount++;
@ -306,7 +305,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (lstat(buff,&localstat) == -1)
{
@@ -2874,7 +2876,7 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2875,14 +2877,14 @@ if (S_ISDIR(statbuf.st_mode))
if (sizeinbytes < SENSIBLEFSSIZE)
{
@ -315,7 +314,6 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,OUTPUT,"");
return(false);
}
@@ -2881,7 +2883,7 @@ if (S_ISDIR(statbuf.st_mode))
if (filecount < SENSIBLEFILECOUNT)
{
@ -324,7 +322,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,OUTPUT,"");
return(false);
}
@@ -2929,7 +2931,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2930,7 +2932,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -333,7 +331,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(pcwd);
if (BufferOverflow(pcwd,dirp->d_name))
@@ -2938,7 +2940,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2939,7 +2941,7 @@ for (dirp = readdir(dirh); dirp != NULL;
return true;
}
@ -342,7 +340,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (lstat(dirp->d_name,&statbuf) == -1)
{
@@ -2982,9 +2984,9 @@ void InstallMountedItem(char *host,char
@@ -2983,9 +2985,9 @@ void InstallMountedItem(char *host,char
{ char buf[CF_BUFSIZE];
@ -355,7 +353,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (IsItemIn(VMOUNTED,buf))
{
@@ -3086,16 +3088,16 @@ if (MatchStringInFstab(mountpt))
@@ -3087,16 +3089,16 @@ if (MatchStringInFstab(mountpt))
CfLog(cfinform,"---------------------------------------------------","");
/* delete current fstab entry and unmount if necessary */
@ -376,7 +374,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
/* delete current fstab entry and unmount if necessary (don't rmdir) */
cleaner.name = mountspec;
@@ -3244,14 +3246,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3245,14 +3247,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
pathbuff[0]='\0';
basename[0]='\0';
@ -394,7 +392,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(pathbuff);
if (*(ptr->path+4) != '/')
@@ -3262,7 +3264,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3263,7 +3265,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
else
{
@ -403,21 +401,21 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
ExpandWildCardsAndDo(pathbuff,basename,RecFileCheck,ptr);
@@ -3296,11 +3298,11 @@ else
EditItemsInResolvConf(from->next,list);
if (isdigit((int)*(work)))
{
- snprintf(buf,CF_BUFSIZE,"nameserver %s",work);
+ snprintf(buf,CF_MAXVARSIZE,"nameserver %s",work);
}
else
{
- strcpy(buf,work);
+ (void)strlcpy(buf,work,sizeof(buf));
}
DeleteItemMatching(list,buf); /* del+prep = move to head of list */
@@ -3373,7 +3375,7 @@ if (strlen(extract) == 0)
@@ -3294,11 +3296,11 @@ void EditItemsInResolvConf(struct Item *
if (isdigit((int)*(work)))
{
- snprintf(buf,CF_BUFSIZE,"nameserver %s",work);
+ (void)snprintf(buf,CF_MAXVARSIZE,"nameserver %s",work);
}
else
{
- strncpy(buf,work,CF_MAXVARSIZE-1);
+ (void)strlcpy(buf,work,sizeof(buf));
}
DeleteItemMatching(list,buf); /* del+prep = move to head of list */
@@ -3370,7 +3372,7 @@ if (strlen(extract) == 0)
{
if (isdir)
{
@ -426,7 +424,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
(*function)(buffer,argptr);
return;
@@ -3381,7 +3383,7 @@ if (strlen(extract) == 0)
@@ -3378,20 +3380,20 @@ if (strlen(extract) == 0)
if (! IsWildCard(extract))
{
@ -435,7 +433,6 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (BufferOverflow(buffer,extract))
{
snprintf(OUTPUT,CF_BUFSIZE*2,"Culprit %s\n",extract);
@@ -3388,13 +3390,13 @@ if (! IsWildCard(extract))
CfLog(cferror,OUTPUT,"");
exit(0);
}
@ -451,7 +448,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if ((dirh=opendir(buffer)) == NULL)
{
@@ -3404,7 +3406,7 @@ else
@@ -3401,7 +3403,7 @@ else
}
count = 0;
@ -460,7 +457,7 @@ $OpenBSD: patch-src_do_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (dp = readdir(dirh); dp != 0; dp = readdir(dirh))
{
@@ -3414,8 +3416,8 @@ else
@@ -3411,8 +3413,8 @@ else
}
count++;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/edittools.c.orig Thu Apr 22 21:34:19 2004
+++ src/edittools.c Thu Jun 17 12:54:38 2004
$OpenBSD: patch-src_edittools_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/edittools.c.orig Wed Jun 23 17:38:13 2004
+++ src/edittools.c Mon Aug 2 13:30:34 2004
@@ -74,7 +74,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -65,7 +65,7 @@ $OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (!FileObjectFilter(realname,&statbuf2,ptr->filters,editfiles))
{
@@ -401,8 +401,8 @@ NUMBEROFEDITS = 0;
@@ -402,8 +402,8 @@ NUMBEROFEDITS = 0;
EDITVERBOSE = VERBOSE;
CURRENTLINENUMBER = 1;
CURRENTLINEPTR = filestart;
@ -76,7 +76,7 @@ $OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
EDITGROUPLEVEL = 0;
SEARCHREPLACELEVEL = 0;
FOREACHLEVEL = 0;
@@ -1303,6 +1303,7 @@ return true;
@@ -1330,6 +1330,7 @@ return true;
int ReplaceEditLineWith (char *string)
{ char *sp;
@ -84,7 +84,7 @@ $OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (strcmp(string,CURRENTLINEPTR->name) == 0)
{
@@ -1310,7 +1311,8 @@ if (strcmp(string,CURRENTLINEPTR->name)
@@ -1337,14 +1338,15 @@ if (strcmp(string,CURRENTLINEPTR->name)
return true;
}
@ -94,7 +94,6 @@ $OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
{
printf("Memory allocation failed in ReplaceEditLineWith, aborting edit.\n");
return false;
@@ -1317,7 +1319,7 @@ if ((sp = malloc(strlen(string)+1)) == N
}
EditVerbose("Replacing line %d with %10s...\n",CURRENTLINENUMBER,string);
@ -103,7 +102,7 @@ $OpenBSD: patch-src_edittools_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
free (CURRENTLINEPTR->name);
CURRENTLINEPTR->name = sp;
NUMBEROFEDITS++;
@@ -2023,10 +2025,10 @@ int SaveBinaryFile(char *file,off_t size
@@ -2050,10 +2052,10 @@ int SaveBinaryFile(char *file,off_t size
Debug("SaveBinaryFile(%s,%d)\n",file,size);
Verbose("Saving %s\n",file);

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_eval_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/eval.c.orig 2004-04-17 10:11:08.000000000 -0400
+++ src/eval.c 2004-06-10 15:35:56.000000000 -0400
$OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/eval.c.orig Tue Jun 8 04:40:45 2004
+++ src/eval.c Mon Aug 2 13:30:34 2004
@@ -212,7 +212,7 @@ sscanf(str,"%*s %s %s %s %s",buf2,buf3,b
/* Hours */
@ -64,7 +64,7 @@ $OpenBSD: patch-src_eval_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(out);
}
@@ -533,7 +533,7 @@ while(*sp != '\0')
@@ -548,7 +548,7 @@ while(*sp != '\0')
if (IsHardClass(cbuff))
{ char err[CF_BUFSIZE];
yyerror("Illegal exception");
@ -73,7 +73,7 @@ $OpenBSD: patch-src_eval_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
FatalError(err);
}
@@ -827,7 +827,7 @@ for (sp = class; *sp != '\0'; sp++)
@@ -858,7 +858,7 @@ for (sp = class; *sp != '\0'; sp++)
if (bracklevel != 0)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filenames_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/filenames.c.orig 2004-06-10 10:50:04.000000000 -0400
+++ src/filenames.c 2004-06-10 12:15:00.000000000 -0400
$OpenBSD: patch-src_filenames_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/filenames.c.orig Mon Jun 7 14:03:15 2004
+++ src/filenames.c Mon Aug 2 13:30:34 2004
@@ -121,7 +121,7 @@ if (str == NULL)
if (!IsFileSep(str[strlen(str)-1]))
@ -60,7 +60,7 @@ $OpenBSD: patch-src_filenames_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
snprintf(OUTPUT,CF_BUFSIZE,"Moving obstructing file/link %s to %s to make directory",pathbuf,currentpath);
CfLog(cferror,OUTPUT,"");
@@ -633,7 +633,7 @@ for (sp = src+rootlen; *sp != '\0'; sp++
@@ -640,7 +640,7 @@ for (sp = src+rootlen; *sp != '\0'; sp++
return false;
}
@ -69,7 +69,7 @@ $OpenBSD: patch-src_filenames_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
return true;
@@ -695,7 +695,7 @@ if (strlen(str) >= CF_BUFSIZE)
@@ -702,7 +702,7 @@ if (strlen(str) >= CF_BUFSIZE)
{
char *tmp;
tmp = malloc(40+strlen(str));

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filters_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/filters.c.orig 2004-06-10 10:50:04.000000000 -0400
+++ src/filters.c 2004-06-10 11:33:57.000000000 -0400
$OpenBSD: patch-src_filters_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/filters.c.orig Thu Jun 24 15:01:11 2004
+++ src/filters.c Mon Aug 2 13:30:34 2004
@@ -177,7 +177,7 @@ else
break;
}
@ -31,7 +31,7 @@ $OpenBSD: patch-src_filters_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
fromtime = Date2Number(fromexpr,now);
totime = Date2Number(toexpr,now);
@@ -1145,7 +1145,7 @@ int FilterOwnerMatch(struct stat *lstatp
@@ -1153,7 +1153,7 @@ int FilterOwnerMatch(struct stat *lstatp
char buffer[64];
struct passwd *pw;
@ -40,7 +40,7 @@ $OpenBSD: patch-src_filters_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
PrependItem(&attrib,buffer,"");
if ((pw = getpwuid(lstatptr->st_uid)) != NULL)
@@ -1177,7 +1177,7 @@ int FilterGroupMatch(struct stat *lstatp
@@ -1185,7 +1185,7 @@ int FilterGroupMatch(struct stat *lstatp
char buffer[64];
struct group *gr;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/functions.c.orig Sat May 1 15:36:52 2004
+++ src/functions.c Thu Jun 17 12:54:39 2004
@@ -206,13 +206,13 @@ switch (fn = FunctionStringToCode(name))
$OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/functions.c.orig Sat May 29 03:10:58 2004
+++ src/functions.c Mon Aug 2 15:44:54 2004
@@ -215,13 +215,13 @@ case fn_syslog:
{
if (strcmp(value,CF_NOCLASS) == 0)
{
@ -17,7 +17,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return value;
}
}
@@ -307,7 +307,7 @@ if (strchr(args,','))
@@ -316,46 +316,46 @@ if (strchr(args,','))
if (lstat(args,&statbuf) == -1)
{
@ -26,7 +26,6 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
else
@@ -314,12 +314,12 @@ if (lstat(args,&statbuf) == -1)
{
if (fn == fn_fileexists)
{
@ -41,7 +40,6 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
switch(fn)
{
@@ -326,7 +326,7 @@ strcpy(value,CF_NOCLASS);
case fn_isdir:
if (S_ISDIR(statbuf.st_mode))
{
@ -50,7 +48,6 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
break;
@@ -333,7 +333,7 @@ strcpy(value,CF_NOCLASS);
case fn_islink:
if (S_ISLNK(statbuf.st_mode))
{
@ -59,7 +56,6 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
break;
@@ -340,13 +340,13 @@ strcpy(value,CF_NOCLASS);
case fn_isplain:
if (S_ISREG(statbuf.st_mode))
{
@ -75,7 +71,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*********************************************************************/
@@ -361,7 +361,7 @@ if (strchr(args,','))
@@ -370,7 +370,7 @@ if (strchr(args,','))
return;
}
@ -84,7 +80,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (!FuzzyMatchParse(args))
{
@@ -370,7 +370,7 @@ if (!FuzzyMatchParse(args))
@@ -379,7 +379,7 @@ if (!FuzzyMatchParse(args))
if (FuzzySetMatch(args,VIPADDRESS) == 0)
{
@ -93,7 +89,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
}
@@ -385,7 +385,7 @@ void HandleHostRange(char *args,char *va
@@ -394,7 +394,7 @@ void HandleHostRange(char *args,char *va
if (!FuzzyHostParse(args))
{
@ -102,7 +98,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
/* VDEFAULTBINSERVER.name is relative domain name */
@@ -394,12 +394,12 @@ void HandleHostRange(char *args,char *va
@@ -403,12 +403,12 @@ void HandleHostRange(char *args,char *va
if (FuzzyHostMatch(args,VDEFAULTBINSERVER.name) == 0)
{
Debug("SRDEBUG SUCCESS!\n");
@ -117,7 +113,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
return;
@@ -414,7 +414,7 @@ void HandleCompareStat(enum builtin fn,c
@@ -423,7 +423,7 @@ void HandleCompareStat(enum builtin fn,c
int count = 0;
FunctionArgs(args,argv,2);
@ -126,7 +122,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (stat(argv[0],&frombuf) == -1)
{
@@ -431,7 +431,7 @@ switch(fn)
@@ -440,7 +440,7 @@ switch(fn)
case fn_newerthan:
if (frombuf.st_mtime < tobuf.st_mtime)
{
@ -135,7 +131,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
break;
@@ -439,7 +439,7 @@ switch(fn)
@@ -448,7 +448,7 @@ switch(fn)
case fn_accessedbefore:
if (frombuf.st_atime < tobuf.st_atime)
{
@ -144,7 +140,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
break;
@@ -447,13 +447,13 @@ switch(fn)
@@ -456,13 +456,13 @@ switch(fn)
case fn_changedbefore:
if (frombuf.st_ctime < tobuf.st_ctime)
{
@ -160,7 +156,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
@@ -500,7 +500,7 @@ if (*args == '/')
@@ -509,7 +509,7 @@ if (*args == '/')
if (ShellCommandReturnsZero(command))
{
@ -169,7 +165,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
}
@@ -509,7 +509,7 @@ if (*args == '/')
@@ -518,7 +518,7 @@ if (*args == '/')
yyerror("ExecResult(/command) must specify an absolute path");
}
@ -178,7 +174,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
@@ -527,11 +527,11 @@ Debug("HandleIsDefined(%s)\n",args);
@@ -536,11 +536,11 @@ Debug("HandleIsDefined(%s)\n",args);
if (GetMacroValue(CONTEXTID,args))
{
@ -192,7 +188,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*********************************************************************/
@@ -547,7 +547,7 @@ value[0] = '\0';
@@ -556,7 +556,7 @@ value[0] = '\0';
if (PARSING)
{
@ -201,7 +197,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -602,11 +602,11 @@ FunctionArgs(args,argv,2);
@@ -611,11 +611,11 @@ FunctionArgs(args,argv,2);
if (strcmp(argv[0],argv[1]) == 0)
{
@ -215,7 +211,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
}
@@ -632,11 +632,11 @@ ret = LocateNextItemMatching(list,argv[0
@@ -641,11 +641,11 @@ ret = LocateNextItemMatching(list,argv[0
if (ret != NULL)
{
@ -229,7 +225,43 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
DeleteItemList(list);
@@ -904,7 +904,7 @@ Verbose("This is a method with return va
@@ -985,7 +985,7 @@ first[0] = '\0';
if (psize < 2)
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -994,7 +994,7 @@ Verbose("Searching for my peer group in
if (!((strcmp("random",policy) == 0) || (strcmp("first",policy) == 0)))
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
CfLog(cferror,"Partition leader policy is first/random only","");
return;
}
@@ -1149,7 +1149,7 @@ value[0] = '\0';
if (psize < 2)
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -1158,7 +1158,7 @@ Verbose("Searching for my peer group nei
if (!(strcmp("random",policy) == 0 || strcmp("first",policy) == 0))
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
CfLog(cferror,"Partition leader policy is first/random only","");
return;
}
@@ -1286,7 +1286,7 @@ Verbose("This is a method with return va
yyerror("Redefinition of method return values");
}
@ -238,7 +270,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*********************************************************************/
@@ -916,7 +916,7 @@ Verbose("This is a method with return cl
@@ -1298,14 +1298,14 @@ Verbose("This is a method with return cl
if (strlen(METHODRETURNCLASSES) == 0)
{
@ -247,7 +279,6 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -923,7 +923,7 @@ Verbose("This is a method with return cl
yyerror("Redefinition of method return classes");
}
@ -256,7 +287,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*********************************************************************/
@@ -949,7 +949,7 @@ Debug("ShowState(%s)\n",args);
@@ -1331,7 +1331,7 @@ Debug("ShowState(%s)\n",args);
if (PARSING)
{
@ -265,7 +296,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -1132,12 +1132,12 @@ if (stat(buffer,&statbuf) == 0)
@@ -1516,12 +1516,12 @@ if (stat(buffer,&statbuf) == 0)
printf("%s: -----------------------------------------------------------------------------------\n",VPREFIX);
snprintf(buffer,CF_BUFSIZE,"State of %s peaked at %s\n",args,ctime(&statbuf.st_mtime));
@ -279,8 +310,8 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
+ (void)strlcpy(value,buffer,CF_EXPANDSIZE);
}
if (dist)
@@ -1162,7 +1162,7 @@ FunctionArgs(args,argv,1);
DeleteItemList(addresses);
@@ -1548,7 +1548,7 @@ FunctionArgs(args,argv,1);
if (PARSING)
{
@ -289,7 +320,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -1173,7 +1173,7 @@ if (time >= 0)
@@ -1559,7 +1559,7 @@ if (time >= 0)
CheckFriendConnections(time);
}
@ -298,7 +329,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*********************************************************************/
@@ -1243,11 +1243,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
@@ -1629,11 +1629,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
if (CheckForModule(argv[0],argv[1]))
{
@ -312,7 +343,7 @@ $OpenBSD: patch-src_functions_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
}
@@ -1285,7 +1285,7 @@ if (strchr(args,','))
@@ -1671,7 +1671,7 @@ if (strchr(args,','))
return;
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/image.c.orig Fri Apr 30 17:20:19 2004
+++ src/image.c Thu Jun 17 12:54:39 2004
$OpenBSD: patch-src_image_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/image.c.orig Fri Apr 30 11:20:19 2004
+++ src/image.c Mon Aug 2 13:30:34 2004
@@ -57,8 +57,8 @@ Banner("Looking for remote method collab
}
else
@ -79,7 +79,7 @@ $OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(destdir);
if ((dirh = cfopendir(sourcedir,ip)) == NULL)
@@ -535,7 +535,7 @@ if (S_ISDIR(sourcestatbuf.st_mode))
@@ -535,22 +535,22 @@ if (S_ISDIR(sourcestatbuf.st_mode))
continue;
}
@ -88,7 +88,6 @@ $OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (BufferOverflow(sourcefile,dirp->d_name))
{
@@ -542,8 +542,8 @@ if (S_ISDIR(sourcestatbuf.st_mode))
FatalError("Culprit: CheckImage");
}
@ -99,7 +98,6 @@ $OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (BufferOverflow(destfile,dirp->d_name))
{
@@ -550,7 +550,7 @@ if (S_ISDIR(sourcestatbuf.st_mode))
FatalError("Culprit: CheckImage");
}
@ -153,7 +151,7 @@ $OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (remote)
{
@@ -1614,7 +1614,7 @@ if (IMAGEBACKUP != 'n')
@@ -1614,22 +1614,22 @@ if (IMAGEBACKUP != 'n')
time_t STAMPNOW;
STAMPNOW = time((time_t *)NULL);
@ -162,7 +160,6 @@ $OpenBSD: patch-src_image_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (BufferOverflow(dest,stamp))
{
@@ -1621,15 +1621,15 @@ if (IMAGEBACKUP != 'n')
printf(" culprit: CopyReg\n");
return false;
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/install.c.orig 2004-05-01 15:53:44.000000000 +0200
+++ src/install.c 2004-06-15 10:36:49.000000000 +0200
$OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/install.c.orig Wed Jun 30 13:30:58 2004
+++ src/install.c Mon Aug 2 13:40:59 2004
@@ -106,7 +106,7 @@ else
FatalError("Redefinition of basic system variable");
}
@ -43,7 +43,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(CanonifyName(buffer));
}
@@ -161,7 +161,7 @@ else
@@ -162,7 +162,7 @@ else
break;
}
@ -52,7 +52,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfnetmask:
@@ -175,7 +175,7 @@ else
@@ -176,7 +176,7 @@ else
yyerror("Multiple declaration of variable netmask");
FatalError("Redefinition of basic system variable");
}
@ -61,7 +61,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddNetworkClass(VNETMASK);
break;
@@ -337,7 +337,7 @@ else
@@ -338,7 +338,7 @@ else
break;
case cfnfstype:
@ -70,7 +70,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfmethodname:
@@ -417,7 +417,7 @@ else
@@ -418,7 +418,7 @@ else
{
}
@ -79,7 +79,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(rename);
break;
@@ -438,7 +438,7 @@ else
@@ -439,7 +439,7 @@ else
yyerror("Silly interface name, (should be something link eth0)");
}
@ -88,7 +88,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
VIFDEV[VSYSTEMHARDCLASS] = VIFNAMEOVERRIDE; /* override */
Debug("Overriding interface with %s\n",VIFDEV[VSYSTEMHARDCLASS]);
break;
@@ -538,7 +538,7 @@ switch(GetCommAttribute(item))
@@ -539,7 +539,7 @@ switch(GetCommAttribute(item))
case cfowner:
if (strlen(value) < CF_BUFSIZE)
{
@ -97,7 +97,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -549,7 +549,7 @@ switch(GetCommAttribute(item))
@@ -550,7 +550,7 @@ switch(GetCommAttribute(item))
case cfgroup:
if (strlen(value) < CF_BUFSIZE)
{
@ -106,7 +106,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -631,13 +631,13 @@ switch(GetCommAttribute(item))
@@ -632,13 +632,13 @@ switch(GetCommAttribute(item))
break;
case cfflags: ParseFlagString(value,&PLUSFLAG,&MINUSFLAG);
break;
@ -124,7 +124,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfcompat: HandleCharSwitch("oldserver",value,&COMPATIBILITY);
break;
@@ -810,7 +810,7 @@ Debug1("HandleOptionalMountItem(%s)\n",v
@@ -811,7 +811,7 @@ Debug1("HandleOptionalMountItem(%s)\n",v
switch(GetCommAttribute(item))
{
case cfmountoptions:
@ -133,7 +133,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfreadonly:
@@ -997,7 +997,7 @@ switch(GetCommAttribute(item))
@@ -998,7 +998,7 @@ switch(GetCommAttribute(item))
case cfinclude:
case cfpattern:
@ -142,7 +142,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (*value == '/')
{
yyerror("search pattern begins with / must be a relative name");
@@ -1073,9 +1073,9 @@ switch(GetCommAttribute(item))
@@ -1074,9 +1074,9 @@ switch(GetCommAttribute(item))
break;
case cfflags: ParseFlagString(value,&PLUSFLAG,&MINUSFLAG);
break;
@ -154,7 +154,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfdefine: HandleDefine(value);
break;
@@ -1281,9 +1281,9 @@ switch(GetCommAttribute(item))
@@ -1282,9 +1282,9 @@ switch(GetCommAttribute(item))
break;
case cffilter: PrependItem(&VFILTERBUILD,value,CF_ANYCLASS);
break;
@ -166,7 +166,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfchdir: HandleChDir(value);
break;
@@ -1323,7 +1323,7 @@ Debug1("HandleOptionalPackagesAttribute(
@@ -1324,7 +1324,7 @@ Debug1("HandleOptionalPackagesAttribute(
switch(GetCommAttribute(item))
{
@ -175,21 +175,20 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfcmp: CMPSENSE = (enum cmpsense) GetCmpSense(value);
break;
@@ -1378,11 +1378,11 @@ if (value[0] == '\0')
@@ -1376,10 +1376,10 @@ if (value[0] == '\0')
strncpy(METHODFILENAME,value,CF_BUFSIZE-1);
break;
case cfretclasses:
- strncpy(METHODRETURNCLASSES,value,CF_BUFSIZE-1);
+ strlcpy(METHODRETURNCLASSES,value,sizeof(METHODRETURNCLASSES));
+ (void)strlcpy(METHODRETURNCLASSES,value,sizeof(METHODRETURNCLASSES));
break;
case cfforcereplyto:
- strncpy(METHODFORCE,value,CF_BUFSIZE-1);
+ strlcpy(METHODFORCE,value,sizeof(METHODFORCE));
+ (void)strlcpy(METHODFORCE,value,sizeof(METHODFORCE));
break;
case cfsendclasses:
@@ -1445,9 +1445,9 @@ switch(GetCommAttribute(item))
strncpy(METHODREPLYTO,value,CF_MAXVARSIZE-1);
@@ -1440,9 +1440,9 @@ switch(GetCommAttribute(item))
break;
case cfsetinform: HandleCharSwitch("inform",value,&INFORMP);
break;
@ -201,7 +200,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfdefine: HandleDefine(value);
break;
@@ -1513,7 +1513,7 @@ if (!IsAbsoluteFileName(value))
@@ -1508,7 +1508,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -210,7 +209,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*******************************************************************/
@@ -1526,7 +1526,7 @@ if (!IsAbsoluteFileName(value))
@@ -1521,7 +1521,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -219,7 +218,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*******************************************************************/
@@ -1537,7 +1537,7 @@ void HandleFileItem(char *item)
@@ -1532,7 +1532,7 @@ void HandleFileItem(char *item)
if (strcmp(item,"home") == 0)
{
ACTIONPENDING=true;
@ -228,7 +227,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -1567,19 +1567,19 @@ if (VBROADCAST[0] != '\0')
@@ -1562,19 +1562,19 @@ if (VBROADCAST[0] != '\0')
if (strcmp("ones",item) == 0)
{
@ -251,22 +250,22 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -1622,12 +1622,12 @@ ExpandVarstring(item,ebuff,NULL);
@@ -1617,12 +1617,12 @@ ExpandVarstring(item,ebuff,NULL);
else
{
memcpy(&inaddr,hp->h_addr, hp->h_length);
- strcpy(VDEFAULTROUTE,inet_ntoa(inaddr));
- strncpy(VDEFAULTROUTE,inet_ntoa(inaddr),CF_MAXVARSIZE);
+ (void)strlcpy(VDEFAULTROUTE,inet_ntoa(inaddr),sizeof(VDEFAULTROUTE));
}
}
else
{
- strcpy(VDEFAULTROUTE,ebuff);
- strncpy(VDEFAULTROUTE,ebuff,CF_MAXVARSIZE);
+ (void)strlcpy(VDEFAULTROUTE,ebuff,sizeof(VDEFAULTROUTE));
}
}
@@ -1905,7 +1905,7 @@ if (VMAILSERVER[0] != '\0')
@@ -1906,7 +1906,7 @@ if (VMAILSERVER[0] != '\0')
FatalError("Redefinition of mailserver");
}
@ -275,7 +274,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug1("Installing mailserver (%s) for group (%s)",path,GROUPBUFF);
}
@@ -2621,9 +2621,9 @@ switch (action)
@@ -2622,9 +2622,9 @@ switch (action)
{
switch (MOUNTMODE)
{
@ -287,7 +286,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
default: printf("Install pending, miscmount, shouldn't happen\n");
MOUNTOPTS[0] = '\0'; /* no mount mode set! */
@@ -2639,8 +2639,8 @@ switch (action)
@@ -2640,8 +2640,8 @@ switch (action)
MOUNTFROM, MOUNTONTO);
return;
}
@ -298,16 +297,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
AppendMiscMount(MOUNTFROM,MOUNTONTO,MOUNTOPTS);
}
@@ -2857,7 +2857,7 @@ if (data == NULL)
}
else
{
- Debug1("InstallEditFile(%s,%s,%s) with classes\n",file,edit,data,CLASSBUFF);
+ Debug1("InstallEditFile(%s,%s,%s) with classes %s\n",file,edit,data,CLASSBUFF);
}
if (!IsInstallable(CLASSBUFF))
@@ -3479,11 +3479,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
@@ -3500,11 +3500,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
if (strlen(type) == 0)
{
@ -321,7 +311,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
if ((ptr->type = strdup(ebuff)) == NULL)
@@ -3606,7 +3606,7 @@ if (!strstr(function,"("))
@@ -3629,7 +3629,7 @@ if (!strstr(function,"("))
}
/* First look at bare args to cache an arg fingerprint */
@ -330,7 +320,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (work[strlen(work)-1] != ')')
{
@@ -4800,12 +4800,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
@@ -4824,12 +4824,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
if (strlen(action) == 0) /* default action */
{
@ -345,25 +335,16 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
yyerror(VBUFF);
return;
}
@@ -4821,7 +4821,7 @@ if (strlen(buf1) > 1)
if (!FORCENETCOPY && ((strcmp(buf3,VFQNAME) == 0) || (strcmp(buf3,VUQNAME) == 0) || (strcmp(buf3,VSYSNAME.nodename) == 0)))
{
Debug("Swapping %s for localhost\n",server);
- strcpy(buf3,"localhost");
+ (void)strlcpy(buf3,"localhost",sizeof(buf3));
}
Build2DListFromVarstring(&tp,path,'/'); /* Must split on space in comm string */
@@ -4880,7 +4880,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
if (strlen(destination) == 0)
{
- strcpy(buf2,spl);
+ (void)strlcpy(buf2,spl,sizeof(buf2));
}
else
{
@@ -5211,11 +5211,11 @@ if (strlen(CURRENTITEM) != 0)
@@ -4937,7 +4937,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
if (strlen(destination) == 0)
{
- strcpy(buf2,spl);
+ (void)strlcpy(buf2,spl,sizeof(buf2));
}
else
{
@@ -5245,11 +5245,11 @@ if (strlen(CURRENTITEM) != 0)
if (strcmp(value,"link") == 0 || strcmp(value,"links") == 0)
{
@ -377,7 +358,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -5334,7 +5334,7 @@ void HandleNetmask(char *value)
@@ -5368,7 +5368,7 @@ void HandleNetmask(char *value)
{
if (strlen(DESTINATION) == 0)
{
@ -386,7 +367,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -5349,7 +5349,7 @@ void HandleIPAddress(char *value)
@@ -5383,7 +5383,7 @@ void HandleIPAddress(char *value)
{
if (strlen(LINKTO) == 0)
{
@ -395,7 +376,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -5370,19 +5370,19 @@ if (strlen(CURRENTOBJECT) != 0)
@@ -5404,19 +5404,19 @@ if (strlen(CURRENTOBJECT) != 0)
if (strcmp("ones",value) == 0)
{
@ -418,7 +399,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return;
}
@@ -5395,6 +5395,7 @@ void AppendToActionSequence (char *actio
@@ -5429,6 +5429,7 @@ void AppendToActionSequence (char *actio
{ int j = 0;
char *sp,cbuff[CF_BUFSIZE],actiontxt[CF_BUFSIZE];
@ -426,7 +407,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug1("Installing item (%s) in the action sequence list\n",action);
@@ -5426,8 +5427,10 @@ while (*sp != '\0')
@@ -5460,8 +5461,10 @@ while (*sp != '\0')
if (IsHardClass(cbuff))
{
@ -439,7 +420,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
yyerror(tmp);
free(tmp);
yyerror("You cannot add a reserved class!");
@@ -5436,7 +5439,7 @@ while (*sp != '\0')
@@ -5470,7 +5473,7 @@ while (*sp != '\0')
if (j == 1)
{
@ -448,7 +429,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
continue;
}
else if (!IsSpecialClass(cbuff))
@@ -5463,7 +5466,7 @@ if (isalpha((int)user[0]))
@@ -5497,7 +5500,7 @@ if (isalpha((int)user[0]))
return;
}
@ -457,7 +438,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AppendItem(&VACCESSLIST,id,NULL);
}
else
@@ -5561,7 +5564,7 @@ void HandleServer(char *value)
@@ -5595,7 +5598,7 @@ void HandleServer(char *value)
{
Debug("Server in copy set to : %s\n",value);
@ -466,7 +447,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/*******************************************************************/
@@ -5583,7 +5586,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5617,7 +5620,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror(OUTPUT);
}
*/
@ -475,7 +456,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5613,7 +5616,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5647,7 +5650,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -484,7 +465,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5643,7 +5646,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5677,7 +5680,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -493,7 +474,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -6256,8 +6259,8 @@ switch(GetCommAttribute(attribute))
@@ -6290,8 +6293,8 @@ switch(GetCommAttribute(attribute))
{
if (strlen(copyhost)+strlen(VDOMAIN) < CF_MAXVARSIZE-2)
{
@ -504,7 +485,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -6290,6 +6293,7 @@ void PrependTidy(struct TidyPattern **li
@@ -6324,6 +6327,7 @@ void PrependTidy(struct TidyPattern **li
{ struct TidyPattern *tp;
char *spe = NULL,*sp, buffer[CF_EXPANDSIZE];
@ -512,7 +493,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if ((tp = (struct TidyPattern *)malloc(sizeof(struct TidyPattern))) == NULL)
{
@@ -6319,10 +6323,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
@@ -6353,10 +6357,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
AddInstallable(tp->defines);
AddInstallable(tp->elsedef);
@ -530,7 +511,7 @@ $OpenBSD: patch-src_install_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
if (travlinks == '?')
@@ -6348,7 +6356,7 @@ tp->rmdirs =tidydirs;
@@ -6382,7 +6390,7 @@ tp->rmdirs =tidydirs;
if (classes != NULL)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/item-ext.c.orig Sat Apr 17 16:11:02 2004
+++ src/item-ext.c Thu Jun 17 12:54:39 2004
$OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/item-ext.c.orig Wed Jun 23 17:30:52 2004
+++ src/item-ext.c Mon Aug 2 14:48:07 2004
@@ -190,6 +190,7 @@ void InsertItemAfter (struct Item **file
{ struct Item *ip;
@ -136,7 +136,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug2("CommentToRegExp(list,%s %s)\n",comm,string);
@@ -1168,7 +1175,8 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1168,16 +1175,17 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
NUMBEROFEDITS++;
CURRENTLINEPTR = ip->next;
@ -146,7 +146,6 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
{
CfLog(cferror,"No memory in CommentToRegExp\n","malloc");
regfree(&rx);
@@ -1175,9 +1183,9 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
return false;
}
@ -168,7 +167,23 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
i += strlen(replace)-1;
memcpy(&rx,&rxcache,sizeof(rx)); /* To fix a bug on some implementations where rx gets emptied */
@@ -1424,6 +1432,7 @@ int CommentSeveralLines(struct Item **fi
@@ -1449,12 +1457,12 @@ char *search, *replace;
start = ip->name + match.rm_so;
EditVerbose("Doing SingleReplace of \"%s\" with \"%s\" on line %d\n",start,replace,i);
bzero(VBUFF,CF_BUFSIZE);
- strcpy(VBUFF,ip->name);
+ (void)strlcpy(VBUFF,ip->name,sizeof(VBUFF));
VBUFF[match.rm_so] = '\0'; /* ...head of string */
- strcat(VBUFF,replace); /* ...replacement string */
+ (void)strlcat(VBUFF,replace,sizeof(VBUFF)); /* ...replacement string */
sp = ip->name;
sp += match.rm_eo;
- strcat(VBUFF,sp); /* ...tail of string */
+ (void)strlcat(VBUFF,sp,sizeof(VBUFF)); /* ...tail of string */
Debug("SRDEBUG old line num %d is: \"%s\"\n",i,ip->name);
Debug("SRDEBUG new line num %d is: \"%s\"\n",i,VBUFF);
CURRENTLINEPTR = ip;
@@ -1477,6 +1485,7 @@ int CommentSeveralLines(struct Item **fi
{ struct Item *ip;
int ctr, N = -99, done = false;
char *sp;
@ -176,7 +191,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug2("CommentNLines(list,%s)\n",string);
@@ -1479,15 +1488,16 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1532,15 +1541,16 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
NUMBEROFEDITS++;
CURRENTLINEPTR = ip->next;
@ -197,7 +212,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
free (ip->name);
ip->name = sp;
@@ -1517,6 +1527,7 @@ int UnCommentSeveralLines (struct Item *
@@ -1570,6 +1580,7 @@ int UnCommentSeveralLines (struct Item *
{ struct Item *ip;
int ctr, N = -99, done = false;
char *sp, *sp1, *sp2, *spc;
@ -205,7 +220,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug2("UnCommentNLines(list,%s)\n",string);
@@ -1567,7 +1578,8 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1620,7 +1631,8 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
EditVerbose("Uncomment line %s\n",ip->name);
CURRENTLINEPTR = ip->next;
@ -215,7 +230,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
{
CfLog(cferror,"No memory in UnCommentNLines\n","malloc");
return false;
@@ -1593,11 +1605,11 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1646,11 +1658,11 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
*sp2 = '\0';
}
@ -229,7 +244,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
ctr++;
@@ -1782,7 +1794,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
@@ -1835,7 +1847,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
free(ip->name);
ip->name = (char *) malloc(strlen(replace)+1);
@ -238,7 +253,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
EditVerbose("Edit: With (%s)\n",replace);
}
}
@@ -1793,6 +1805,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
@@ -1846,6 +1858,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
void AppendToLine(struct Item *current,char *text,char *filename)
{ char *new;
@ -246,7 +261,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (strstr(current->name,text))
{
@@ -1801,9 +1814,10 @@ if (strstr(current->name,text))
@@ -1854,9 +1867,10 @@ if (strstr(current->name,text))
EditVerbose("Appending %s to line %-60s...\n",text,current->name);

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_item_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/item.c.orig Sat Apr 17 16:11:01 2004
+++ src/item.c Thu Jun 17 12:54:40 2004
$OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/item.c.orig Tue May 18 02:09:20 2004
+++ src/item.c Mon Aug 2 13:30:35 2004
@@ -212,6 +212,7 @@ void PrependItem (struct Item **liststar
{ struct Item *ip;
@ -66,7 +66,7 @@ $OpenBSD: patch-src_item_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
{
CfLog(cferror,"","malloc");
FatalError("");
@@ -339,13 +347,17 @@ else
@@ -339,20 +347,24 @@ else
lp->next = ip;
}
@ -88,7 +88,6 @@ $OpenBSD: patch-src_item_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
ip->name = sp;
ip->next = NULL;
ip->counter = 0;
@@ -352,7 +364,7 @@ ip->counter = 0;
if (classes != NULL)
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_link_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/link.c.orig Sat Apr 17 16:11:06 2004
+++ src/link.c Thu Jun 17 12:54:40 2004
@@ -61,7 +61,7 @@ for (dirp = readdir(dirh); dirp != NULL;
$OpenBSD: patch-src_link_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/link.c.orig Sat Apr 17 10:11:06 2004
+++ src/link.c Mon Aug 2 13:30:35 2004
@@ -61,23 +61,23 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -10,7 +10,6 @@ $OpenBSD: patch-src_link_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(pcwdto);
if (BufferOverflow(pcwdto,dirp->d_name))
@@ -68,9 +68,9 @@ for (dirp = readdir(dirh); dirp != NULL;
{
FatalError("Can't build filename in LinkChildFiles");
}
@ -22,7 +21,6 @@ $OpenBSD: patch-src_link_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(pcwdfrom);
if (BufferOverflow(pcwdfrom,dirp->d_name))
@@ -77,7 +77,7 @@ for (dirp = readdir(dirh); dirp != NULL;
{
FatalError("Can't build filename in LinkChildFiles");
}
@ -310,7 +308,7 @@ $OpenBSD: patch-src_link_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (sp = relto; *sp != '\0'; sp++)
{
@@ -1181,7 +1181,7 @@ while (pop > 0)
@@ -1181,14 +1181,14 @@ while (pop > 0)
if (strlen(destination) == 0)
{
@ -319,7 +317,6 @@ $OpenBSD: patch-src_link_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -1188,7 +1188,7 @@ else
AddSlash(destination);
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_locks_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/locks.c.orig 2004-06-10 10:50:04.000000000 -0400
+++ src/locks.c 2004-06-10 12:17:40.000000000 -0400
$OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/locks.c.orig Tue May 18 02:37:46 2004
+++ src/locks.c Mon Aug 2 13:30:35 2004
@@ -80,7 +80,7 @@ struct LockData
void PreLockState()
@ -28,7 +28,7 @@ $OpenBSD: patch-src_locks_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/********************************************************************/
@@ -341,7 +341,7 @@ if (PutLock(CFLAST) == -1)
@@ -343,7 +343,7 @@ if (PutLock(CFLAST) == -1)
LockLog(getpid(),"Lock removed normally ",CFLOCK,"");
@ -37,7 +37,7 @@ $OpenBSD: patch-src_locks_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
@@ -666,7 +666,7 @@ if ((tim = time((time_t *)NULL)) == -1)
@@ -668,7 +668,7 @@ if ((tim = time((time_t *)NULL)) == -1)
Debug("Cfengine: couldn't read system clock\n");
}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_macro_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/macro.c.orig 2004-04-17 10:11:08.000000000 -0400
+++ src/macro.c 2004-06-10 15:38:36.000000000 -0400
$OpenBSD: patch-src_macro_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/macro.c.orig Mon May 17 16:05:11 2004
+++ src/macro.c Mon Aug 2 13:30:35 2004
@@ -130,6 +130,7 @@ void AddMacroValue(char *scope,char *nam
{ char *sp, buffer[CF_BUFSIZE],exp[CF_EXPANDSIZE];
struct cfObject *ptr;
@ -26,7 +26,7 @@ $OpenBSD: patch-src_macro_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
slot = Hash(name);
@@ -271,7 +273,7 @@ if (strstr(name,"."))
@@ -273,7 +275,7 @@ if (strstr(name,"."))
if (ptr == NULL)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_methods_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/methods.c.orig 2004-05-04 07:22:50.000000000 -0400
+++ src/methods.c 2004-06-10 16:11:06.000000000 -0400
$OpenBSD: patch-src_methods_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/methods.c.orig Sat Jun 19 05:25:32 2004
+++ src/methods.c Mon Aug 2 15:45:48 2004
@@ -238,24 +238,24 @@ options[0] = '\0';
if (INFORM)
@ -32,7 +32,7 @@ $OpenBSD: patch-src_methods_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
snprintf(execstr,CF_BUFSIZE-1,"%s/bin/cfagent -f %s %s",WORKDIR,GetMethodFilename(ptr),options);
@@ -693,7 +693,7 @@ while (!feof(fp))
@@ -706,7 +706,7 @@ while (!feof(fp))
case cfmeth_sendclass:
Debug("Defining class: %s\n",arg);
@ -41,12 +41,16 @@ $OpenBSD: patch-src_methods_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfmeth_attacharg:
@@ -998,7 +998,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -1012,10 +1012,10 @@ for (dirp = readdir(dirh); dirp != NULL;
SplitMethodName(dirp->d_name,client,server,name,digeststring,extra);
Verbose("This request came from %s - our reply should be sent there!\n",client);
Debug("This request came from %s - our reply should be sent there!\n",client);
- strcpy(METHODREPLYTO,client);
+ (void)strlcpy(METHODREPLYTO,client,sizeof(METHODREPLYTO));
Debug("This request referred to us as %s - a plausible identity\n",client);
- strcpy(METHODFOR,server);
+ (void)strlcpy(METHODFOR,server,sizeof(METHODFOR));
if (strcmp(methodname,name) == 0)
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/misc.c.orig Thu Apr 29 23:35:59 2004
+++ src/misc.c Thu Jun 17 12:54:40 2004
@@ -556,10 +556,10 @@ char *ChecksumPrint(char type,unsigned c
$OpenBSD: patch-src_misc_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/misc.c.orig Fri Jun 25 11:16:01 2004
+++ src/misc.c Mon Aug 2 15:38:54 2004
@@ -556,17 +556,17 @@ char *ChecksumPrint(char type,unsigned c
switch(type)
{
@ -14,7 +14,6 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
len = 16;
break;
}
@@ -566,7 +566,7 @@ switch(type)
for (i = 0; i < len; i++)
{
@ -23,7 +22,7 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
return buffer;
@@ -911,7 +911,7 @@ char strmajor[CF_MAXVARSIZE];
@@ -942,17 +942,17 @@ char strmajor[CF_MAXVARSIZE];
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d", &major) == 1)
{
@ -32,7 +31,6 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
}
@@ -918,10 +918,10 @@ char strmajor[CF_MAXVARSIZE];
if (major != -1 && vendor != "")
{
classbuf[0] = '\0';
@ -46,7 +44,7 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(classbuf);
}
@@ -1040,8 +1040,8 @@ char strminor[CF_MAXVARSIZE];
@@ -1071,15 +1071,15 @@ Verbose("Looking for redhat linux info i
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d.%d", &major, &minor) == 2)
{
@ -57,7 +55,6 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/* red hat 9 is *not* red hat 9.0.
* and same thing with RHEL AS 3
@@ -1048,7 +1048,7 @@ char strminor[CF_MAXVARSIZE];
*/
else if (sscanf(release, "%d", &major) == 1)
{
@ -66,7 +63,7 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
minor = -2;
};
}
@@ -1056,21 +1056,21 @@ char strminor[CF_MAXVARSIZE];
@@ -1087,21 +1087,21 @@ Verbose("Looking for redhat linux info i
if (major != -1 && minor != -1 && vendor != "")
{
classbuf[0] = '\0';
@ -95,7 +92,7 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(classbuf);
}
}
@@ -1121,19 +1121,19 @@ FILE *fp;
@@ -1152,19 +1152,19 @@ FILE *fp;
{
release += strlen(SUSE_RELEASE_FLAG);
sscanf(release, "%d.%d", &major, &minor);
@ -122,3 +119,35 @@ $OpenBSD: patch-src_misc_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(classbuf);
}
@@ -1277,8 +1277,8 @@ char strminor[CF_MAXVARSIZE];
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d.%d", &major, &minor) == 2)
{
- sprintf(strmajor, "%d", major);
- sprintf(strminor, "%d", minor);
+ (void)snprintf(strmajor, sizeof(strmajor), "%d", major);
+ (void)snprintf(strminor, sizeof(strminor), "%d", minor);
}
else
{
@@ -1290,15 +1290,15 @@ char strminor[CF_MAXVARSIZE];
if (major != -1 && minor != -1 && vendor != "")
{
classbuf[0] = '\0';
- strcat(classbuf, vendor);
+ (void)strlcat(classbuf, vendor, sizeof(classbuf));
AddClassToHeap(classbuf);
- strcat(classbuf, "_");
- strcat(classbuf, strmajor);
+ (void)strlcat(classbuf, "_", sizeof(classbuf));
+ (void)strlcat(classbuf, strmajor, sizeof(classbuf));
AddClassToHeap(classbuf);
if (minor != -2)
{
- strcat(classbuf, "_");
- strcat(classbuf, strminor);
+ (void)strlcat(classbuf, "_", sizeof(classbuf));
+ (void)strlcat(classbuf, strminor, sizeof(classbuf));
AddClassToHeap(classbuf);
}
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_modules_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/modules.c.orig 2004-06-10 23:27:12.000000000 -0400
+++ src/modules.c 2004-06-10 23:10:02.000000000 -0400
@@ -69,7 +69,7 @@ else
$OpenBSD: patch-src_modules_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/modules.c.orig Tue May 11 10:01:21 2004
+++ src/modules.c Mon Aug 2 13:30:35 2004
@@ -67,7 +67,7 @@ else
}
AddSlash(ebuff);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_modules_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (stat(ebuff,&statbuf) == -1)
{
@@ -88,7 +88,7 @@ if ((statbuf.st_uid != 0) && (statbuf.st
@@ -86,7 +86,7 @@ if ((statbuf.st_uid != 0) && (statbuf.st
snprintf(OUTPUT,CF_BUFSIZE*2,"Plug-in `%s\'",actiontxt);
Banner(OUTPUT);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_modules_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (BufferOverflow(ebuff,args))
{
@@ -97,7 +97,7 @@ if (BufferOverflow(ebuff,args))
@@ -95,7 +95,7 @@ if (BufferOverflow(ebuff,args))
return false;
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/nameinfo.c.orig Sat May 1 09:40:45 2004
+++ src/nameinfo.c Thu Jun 17 12:54:40 2004
@@ -53,6 +53,7 @@ void GetNameInfo()
$OpenBSD: patch-src_nameinfo_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/nameinfo.c.orig Wed Jun 23 17:55:31 2004
+++ src/nameinfo.c Mon Aug 2 13:30:36 2004
@@ -59,6 +59,7 @@ void GetNameInfo()
time_t tloc;
struct hostent *hp;
struct sockaddr_in cin;
@ -9,7 +9,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
#ifdef AIX
char real_version[_SYS_NMLN];
#endif
@@ -123,12 +124,13 @@ for (i = 0; CLASSATTRIBUTES[i][0] != '\0
@@ -129,12 +130,13 @@ for (i = 0; CLASSATTRIBUTES[i][0] != '\0
}
}
@ -25,7 +25,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
SetDomainName(sp);
for (sp2=sp; *sp2 != '\0'; sp2++) /* Truncate fully qualified name */
@@ -184,7 +186,7 @@ if (VERBOSE || DEBUG || D2 || D3)
@@ -190,7 +192,7 @@ if (VERBOSE || DEBUG || D2 || D3)
}
@ -34,7 +34,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(VBUFF);
Verbose("Additional hard class defined as: %s\n",CanonifyName(VBUFF));
@@ -253,8 +255,8 @@ if (! found)
@@ -259,8 +261,8 @@ if (! found)
CfLog(cferror,"Cfengine: I don't understand what architecture this is!","");
}
@ -45,7 +45,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(CanonifyName(VBUFF));
@@ -271,7 +273,7 @@ else
@@ -277,7 +279,7 @@ else
memset(&cin,0,sizeof(cin));
cin.sin_addr.s_addr = ((struct in_addr *)(hp->h_addr))->s_addr;
Verbose("Address given by nameserver: %s\n",inet_ntoa(cin.sin_addr));
@ -54,7 +54,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (i=0; hp->h_aliases[i]!= NULL; i++)
{
@@ -376,7 +378,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
@@ -382,7 +384,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
}
/* Old style compat */
@ -63,7 +63,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AppendItem(&IPADDRESSES,ip,"");
for (sp = ip+strlen(ip)-1; *sp != '.'; sp--)
@@ -387,8 +389,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
@@ -393,8 +395,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
/* New style */
@ -74,7 +74,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(CanonifyName(ip));
snprintf(name,CF_MAXVARSIZE-1,"ipv4[%s]",CanonifyName(ifp->ifr_name));
AddMacroValue(CONTEXTID,name,inet_ntoa(sin->sin_addr));
@@ -498,9 +500,9 @@ void AddNetworkClass(char *netmask) /* F
@@ -503,9 +505,9 @@ void AddNetworkClass(char *netmask) /* F
if ((nm.s_addr = inet_addr(netmask)) != -1 && (ip.s_addr = inet_addr(VIPADDRESS)) != -1)
{
ip.s_addr &= nm.s_addr; /* Will not work with IPv6 */
@ -86,7 +86,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
while( (sp = strrchr(nmbuf,'.')) && strcmp(sp,".0") == 0 )
{
@@ -523,8 +525,8 @@ void SetDomainName(char *sp) /
@@ -528,22 +530,22 @@ void SetDomainName(char *sp) /
if (gethostname(fqn, sizeof(fqn)) != -1)
{
@ -97,7 +97,6 @@ $OpenBSD: patch-src_nameinfo_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddClassToHeap(CanonifyName(buffer));
AddClassToHeap(CanonifyName(ToLowerStr(buffer)));
@@ -531,14 +533,14 @@ if (gethostname(fqn, sizeof(fqn)) != -1)
if (strstr(fqn,"."))
{
ptr = strchr(fqn, '.');

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_parse_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/parse.c.orig Thu Apr 29 18:30:18 2004
+++ src/parse.c Thu Jun 17 12:54:40 2004
$OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/parse.c.orig Wed Jun 9 03:16:34 2004
+++ src/parse.c Mon Aug 2 13:30:36 2004
@@ -245,7 +245,7 @@ SetStrategies();
Debug1("\n\n==============================BEGIN NEW ACTION %s=============\n\n",ACTIONTEXT[action]);
@ -37,7 +37,7 @@ $OpenBSD: patch-src_parse_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -347,7 +347,7 @@ Debug1("HandleBraceObjectID(%s) in actio
@@ -347,14 +347,14 @@ Debug1("HandleBraceObjectID(%s) in actio
switch (ACTION)
{
case acls:
@ -46,7 +46,6 @@ $OpenBSD: patch-src_parse_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
InstallACL(id,CLASSBUFF);
break;
@@ -354,7 +354,7 @@ switch (ACTION)
case strategies:
if (strlen(STRATEGYNAME) == 0)
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_proto_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/proto.c.orig Sat Apr 17 16:11:10 2004
+++ src/proto.c Thu Jun 17 12:54:40 2004
@@ -131,8 +131,8 @@ if (strcmp(VDOMAIN,CF_START_DOMAIN) == 0
$OpenBSD: patch-src_proto_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/proto.c.orig Mon Jun 28 03:38:20 2004
+++ src/proto.c Mon Aug 2 13:30:36 2004
@@ -132,8 +132,8 @@ if (!SKIPIDENTIFY && (strcmp(VDOMAIN,CF_
if ((strstr(hp->h_name,".") == 0) && (strlen(VDOMAIN) > 0))
{
@ -12,7 +12,7 @@ $OpenBSD: patch-src_proto_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
#endif
@@ -144,7 +144,7 @@ uname = user_ptr ? user_ptr->pw_name : "
@@ -145,14 +145,14 @@ uname = user_ptr ? user_ptr->pw_name : "
if ((strlen(VDOMAIN) > 0) && !IsIPV6Address(dnsname) && !strchr(dnsname,'.'))
{
Debug("Appending domain %s to %s\n",VDOMAIN,dnsname);
@ -21,7 +21,6 @@ $OpenBSD: patch-src_proto_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
strncat(dnsname,VDOMAIN,CF_MAXVARSIZE/2);
}
@@ -151,7 +151,7 @@ if ((strlen(VDOMAIN) > 0) && !IsIPV6Addr
if (strncmp(dnsname,localip,strlen(localip)) == 0)
{
/* Seems to be a bug in some resolvers that adds garbage, when it just returns the input */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_prototypes_h,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/prototypes.h.orig 2004-06-10 16:17:24.000000000 -0400
+++ src/prototypes.h 2004-06-10 16:17:35.000000000 -0400
@@ -198,8 +198,8 @@ int EmbeddedWrite ARGLIST((char *new,int
$OpenBSD: patch-src_prototypes_h,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/prototypes.h.orig Fri Jun 25 11:12:38 2004
+++ src/prototypes.h Mon Aug 2 13:30:36 2004
@@ -201,8 +201,8 @@ int EmbeddedWrite ARGLIST((char *new,int
/* dce_acl.c */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/varstring.c.orig Tue Apr 20 07:49:29 2004
+++ src/varstring.c Thu Jun 17 12:54:41 2004
@@ -354,7 +354,7 @@ for (sp = string; /* No exit */ ; sp++)
$OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/varstring.c.orig Fri Jun 11 05:50:17 2004
+++ src/varstring.c Mon Aug 2 13:42:04 2004
@@ -356,7 +356,7 @@ for (sp = string; /* No exit */ ; sp++)
FatalError("Can't expand varstring");
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -368,7 +368,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -370,7 +370,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -19,7 +19,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
continue;
}
sp++;
@@ -403,7 +403,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -408,7 +408,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -28,7 +28,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cffaculty:
@@ -417,7 +417,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -422,7 +422,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
@@ -428,7 +428,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -433,7 +433,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -46,7 +46,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -436,7 +436,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -441,7 +441,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -55,7 +55,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -445,7 +445,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -450,7 +450,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -64,7 +64,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfnetmask:
@@ -453,7 +453,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -458,7 +458,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -73,7 +73,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
@@ -462,7 +462,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -467,7 +467,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -82,7 +82,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfbinserver:
@@ -476,7 +476,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -481,7 +481,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -91,7 +91,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfsysadm:
@@ -489,7 +489,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -494,7 +494,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -100,7 +100,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfdomain:
@@ -502,7 +502,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -507,7 +507,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -109,7 +109,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfnfstype:
@@ -510,7 +510,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -515,7 +515,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -118,7 +118,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cftimezone:
@@ -523,7 +523,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -528,7 +528,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -127,7 +127,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfclass:
@@ -531,7 +531,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -536,7 +536,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -136,7 +136,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfarch:
@@ -539,7 +539,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -544,7 +544,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -145,7 +145,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfarch2:
@@ -547,7 +547,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -552,7 +552,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -154,7 +154,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
@@ -565,7 +565,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -570,7 +570,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -163,7 +163,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Chop(buffer);
}
@@ -578,7 +578,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -583,7 +583,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -172,7 +172,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -589,7 +589,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -594,7 +594,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -181,7 +181,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -600,7 +600,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -605,7 +605,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -190,7 +190,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
case cfhr:
@@ -610,7 +610,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -615,7 +615,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -199,7 +199,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -621,7 +621,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -626,7 +626,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -208,7 +208,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -629,7 +629,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -634,14 +634,14 @@ for (sp = string; /* No exit */ ; sp++)
if (strlen(ALLCLASSBUFFER) == 0)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
@ -217,7 +217,6 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
if (ExpandOverflow(buffer,ALLCLASSBUFFER))
@@ -636,7 +636,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -226,7 +225,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfspc:
@@ -644,7 +644,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -649,7 +649,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -235,7 +234,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cftab:
@@ -652,7 +652,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -657,7 +657,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -244,7 +243,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cflf:
@@ -660,7 +660,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -665,7 +665,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -253,7 +252,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfcr:
@@ -668,7 +668,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -673,7 +673,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -262,7 +261,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfn:
@@ -676,7 +676,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -681,7 +681,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -271,7 +270,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfdblquote:
@@ -684,7 +684,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -689,14 +689,14 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -280,7 +279,6 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfquote:
if (ExpandOverflow(buffer," "))
@@ -691,7 +691,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -289,7 +287,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
case cfdollar:
@@ -702,7 +702,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -707,7 +707,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -298,7 +296,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
else
{
@@ -710,7 +710,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -715,7 +715,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -307,16 +305,16 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
break;
@@ -743,7 +743,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -748,7 +748,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
- strcat(buffer,env);
+ (void)strlcat(buffer,env,CF_EXPANDSIZE);
Debug("Expansion gave (%s)\n",buffer);
break;
}
@@ -757,7 +757,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -764,7 +764,7 @@ for (sp = string; /* No exit */ ; sp++)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
}
@ -325,7 +323,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
sp += strlen(currentitem);
@@ -791,7 +791,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -798,7 +798,7 @@ for (sp = string; /* No exit */ ; sp++)
sscanf(sp,"%[^$]",currentitem);
@ -334,7 +332,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -805,7 +805,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -812,7 +812,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -343,7 +341,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
continue;
}
sp++;
@@ -819,7 +819,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -826,7 +826,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -352,7 +350,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sscanf(++sp,scanstr,currentitem); /* reduce item */
switch (ScanVariable(currentitem))
@@ -829,7 +829,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -836,7 +836,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -361,7 +359,7 @@ $OpenBSD: patch-src_varstring_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
break;
}
@@ -890,7 +890,7 @@ if (!IsVarString(varstring))
@@ -897,7 +897,7 @@ if (!IsVarString(varstring))
return liststart;
}

View File

@ -1,24 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2004/06/17 11:21:43 sturm Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/cfengine-Anomalies.info
@unexec install-info --delete --info-dir=%D/info %D/info/cfengine-Reference.info
@unexec install-info --delete --info-dir=%D/info %D/info/cfengine-Tutorial.info
info/cfengine-Anomalies.info
info/cfengine-Reference.info
info/cfengine-Reference.info-1
info/cfengine-Reference.info-2
info/cfengine-Reference.info-3
info/cfengine-Reference.info-4
info/cfengine-Reference.info-5
info/cfengine-Reference.info-6
info/cfengine-Reference.info-7
info/cfengine-Reference.info-8
info/cfengine-Tutorial.info
info/cfengine-Tutorial.info-1
info/cfengine-Tutorial.info-2
info/cfengine-Tutorial.info-3
info/cfengine-Tutorial.info-4
info/cfengine-Tutorial.info-5
info/cfengine-Tutorial.info-6
@comment $OpenBSD: PLIST,v 1.5 2004/08/08 14:02:11 sturm Exp $
@comment doc/
@comment doc/cfengine-2.1.7p1/
@info info/cfengine-Anomalies.info
@info info/cfengine-Reference.info
@info info/cfengine-Tutorial.info
man/man8/cfagent.8
man/man8/cfengine.8
man/man8/cfenvd.8
@ -36,7 +21,9 @@ sbin/cfkey
sbin/cfrun
sbin/cfservd
sbin/vicf
share/cfengine/
share/cfengine/cfengine.el
share/examples/cfengine/
share/examples/cfengine/cf.chflags.example
share/examples/cfengine/cf.freebsd.example
share/examples/cfengine/cf.ftp.example
@ -56,9 +43,4 @@ share/examples/cfengine/cfrc.example
share/examples/cfengine/cfrun.hosts.example
share/examples/cfengine/cfservd.conf.example
share/examples/cfengine/update.conf.example
@dirrm share/examples/cfengine
@dirrm share/cfengine
@exec install-info --info-dir=%D/info %D/info/cfengine-Anomalies.info
@exec install-info --info-dir=%D/info %D/info/cfengine-Reference.info
@exec install-info --info-dir=%D/info %D/info/cfengine-Tutorial.info
@extraunexec rm -fr /var/cfengine