cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak and update to 2.1.10

Browse Source 
from maintainer William Yodlowsky <bsd at openbsd.rutgers.edu>
This commit is contained in:
sturm 2004-10-01 21:22:15 +00:00
parent 9caff31144
commit 6b4e484130
26 changed files with 457 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysutils/cfengine/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2004/08/13 19:25:42 brad Exp $
BROKEN= "this version of cfengine has security problems"
# $OpenBSD: Makefile,v 1.19 2004/10/01 21:22:15 sturm Exp $
COMMENT= "GNU system administration tool for networks"
DISTNAME= cfengine-2.1.7p1
V= 2.1.10
DISTNAME= cfengine-2.1.10
CATEGORIES= sysutils
HOMEPAGE= http://www.cfengine.org/
@ -26,4 +25,6 @@ LIB_DEPENDS= lib/db4/db.4:db-4.*:databases/db/v4
CONFIGURE_ENV= ac_cv_lib_pthread_main=no
SUBST_VARS= V
.include <bsd.port.mk>

6
sysutils/cfengine/distinfo
View File

@ -1,3 +1,3 @@
MD5 (cfengine-2.1.7p1.tar.gz) = 8b9970278f131985fa9c5bc368e51a0d
RMD160 (cfengine-2.1.7p1.tar.gz) = f553276ee4fa532c4a459b0e5d4021b1da66cadc
SHA1 (cfengine-2.1.7p1.tar.gz) = 1632ce3522ded45c1bf04187313741fbe59fd9ba
MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3
RMD160 (cfengine-2.1.10.tar.gz) = 0b9f8f805f0ff8abed2468249b86399228d10291
SHA1 (cfengine-2.1.10.tar.gz) = 01e80f12881b35704896757d338548dddc44883c

8
sysutils/cfengine/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2004/06/17 11:21:42 sturm Exp $
--- configure.orig 2004-05-05 11:20:34.000000000 -0400
+++ configure 2004-05-12 11:59:56.000000000 -0400
@@ -9126,6 +9126,7 @@ cat confdefs.h >>conftest.$ac_ext
$OpenBSD: patch-configure,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- configure.orig Thu Aug 12 00:52:34 2004
+++ configure Fri Oct 1 23:14:46 2004
@@ -9128,6 +9128,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default

56
sysutils/cfengine/patches/patch-src_cfagent_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfagent.c.orig Sat Aug 14 00:14:19 2004
+++ src/cfagent.c Fri Oct 1 23:14:46 2004
@@ -217,7 +217,7 @@ void Initialize(int argc,char *argv[])
unsigned char s[16];
char ebuff[CF_EXPANDSIZE];
@ -18,8 +18,8 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
+(void)strlcpy(METHODNAME,"cf-nomethod",sizeof(METHODNAME));
METHODREPLYTO[0] = '\0';
METHODFOR[0] = '\0';
METHODRETURNVARS[0] = '\0';
@@ -241,8 +241,8 @@ METHODRETURNCLASSES[0] = '\0';
@@ -239,8 +239,8 @@ METHODFOR[0] = '\0';
re_syntax_options |= RE_INTERVALS;
#endif
@ -30,7 +30,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
IDClasses();
@@ -283,15 +283,15 @@ for (i = 1; i < argc; i++)
@@ -281,15 +281,15 @@ for (i = 1; i < argc; i++)
VIFELAPSED = VDEFAULTIFELAPSED;
TRAVLINKS = false;
@ -49,7 +49,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -320,8 +320,8 @@ if (NOPRECONFIG)
@@ -318,8 +318,8 @@ if (NOPRECONFIG)
return;
}
@ -60,7 +60,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
@@ -608,8 +608,8 @@ if (strlen(ebuff) != 0)
@@ -605,8 +605,8 @@ if (strlen(ebuff) != 0)
}
else
{
@ -71,7 +71,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
p2 = SortItemListNames(VHEAP);
@@ -750,7 +750,7 @@ if (VACTIONSEQ == NULL)
@@ -747,7 +747,7 @@ if (VACTIONSEQ == NULL)
Warning("perhaps cfagent.conf/update.conf have not yet been set up?");
}
@ -80,7 +80,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (VACCESSLIST != NULL && !IsItemIn(VACCESSLIST,id))
{
@@ -900,7 +900,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
@@ -897,7 +897,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
if (GetMacroValue(CONTEXTID,"BinaryPaddingChar"))
{
@ -89,7 +89,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (ebuff[0] == '\\')
{
@@ -1078,7 +1078,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
@@ -1075,7 +1075,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
CFSTARTTIME = tloc;
@ -98,7 +98,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Verbose("Reference time set to %s\n",ctime(&tloc));
@@ -1441,7 +1441,7 @@ while (*sp != '\0')
@@ -1438,7 +1438,7 @@ while (*sp != '\0')
{
VIFELAPSED = VDEFAULTIFELAPSED;
VEXPIREAFTER = VDEFAULTEXPIREAFTER;
@ -107,25 +107,25 @@ $OpenBSD: patch-src_cfagent_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
continue;
}
else
@@ -1841,8 +1841,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
@@ -1859,8 +1859,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
else
{
size++; /* Allow for : separator */
- strcat(ALLCLASSBUFFER,ip->name);
- strcat(ALLCLASSBUFFER,":");
+ (void)strlcat(ALLCLASSBUFFER,ip->name,sizeof(ALLCLASSBUFFER));
+ (void)strlcat(ALLCLASSBUFFER,":",sizeof(ALLCLASSBUFFER));
}
- strcat(ALLCLASSBUFFER,ip->name);
- strcat(ALLCLASSBUFFER,":");
+ (void)strlcat(ALLCLASSBUFFER,ip->name,sizeof(ALLCLASSBUFFER));
+ (void)strlcat(ALLCLASSBUFFER,":",sizeof(ALLCLASSBUFFER));
}
}
@@ -1861,8 +1861,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
fprintf(fp,"%s\n",ip->name);
@@ -1879,8 +1879,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
else
{
size++; /* Allow for : separator */
- strcat(ALLCLASSBUFFER,ip->name);
- strcat(ALLCLASSBUFFER,":");
+ (void)strlcat(ALLCLASSBUFFER,ip->name,sizeof(ALLCLASSBUFFER));
+ (void)strlcat(ALLCLASSBUFFER,":",sizeof(ALLCLASSBUFFER));
}
- strcat(ALLCLASSBUFFER,ip->name);
- strcat(ALLCLASSBUFFER,":");
+ (void)strlcat(ALLCLASSBUFFER,ip->name,sizeof(ALLCLASSBUFFER));
+ (void)strlcat(ALLCLASSBUFFER,":",sizeof(ALLCLASSBUFFER));
}
}
fprintf(fp,"%s\n",ip->name);

24
sysutils/cfengine/patches/patch-src_cfenvd_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfenvd.c.orig Wed Aug 11 22:46:48 2004
+++ src/cfenvd.c Fri Oct 1 23:14:46 2004
@@ -188,10 +188,10 @@ void CheckOptsAndInit(int argc,char **ar
int c, i,j,k;
@ -111,7 +111,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 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);
}
@@ -1142,7 +1142,7 @@ if (ALL_OUTGOING != NULL)
@@ -1141,7 +1141,7 @@ if (ALL_OUTGOING != NULL)
sscanf(VNETSTAT[VSYSTEMHARDCLASS],"%s",comm);
@ -120,7 +120,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((pp = cfpopen(comm,"r")) == NULL)
{
@@ -1473,7 +1473,7 @@ struct Averages *GetCurrentAverages(char
@@ -1472,7 +1472,7 @@ struct Averages *GetCurrentAverages(char
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -129,7 +129,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1484,7 +1484,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1483,7 +1483,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -138,7 +138,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1534,7 +1534,7 @@ void UpdateAverages(char *timekey,struct
@@ -1533,7 +1533,7 @@ void UpdateAverages(char *timekey,struct
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -147,7 +147,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1545,7 +1545,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1544,7 +1544,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -156,7 +156,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1772,27 +1772,27 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1771,27 +1771,27 @@ if (fabs(delta) < cf_noise_threshold) /*
Debug(" Sensitivity too high ..\n");
buffer[0] = '\0';
@ -190,7 +190,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AppendItem(classlist,buffer2,"2");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1802,33 +1802,33 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1801,33 +1801,33 @@ if (fabs(delta) < cf_noise_threshold) /*
else
{
buffer[0] = '\0';
@ -232,7 +232,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AppendItem(classlist,buffer2,"0");
}
@@ -1838,16 +1838,16 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1837,16 +1837,16 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev > 2.0*sqrt(2.0))
{
@ -253,7 +253,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AppendItem(classlist,buffer2,"3");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1862,13 +1862,13 @@ void SetVariable(char *name,double value
@@ -1861,13 +1861,13 @@ void SetVariable(char *name,double value
{ char var[CF_BUFSIZE];

22
sysutils/cfengine/patches/patch-src_cfenvgraph_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfenvgraph.c.orig Wed Aug 11 22:47:25 2004
+++ src/cfenvgraph.c Fri Oct 1 23:14:46 2004
@@ -171,7 +171,7 @@ fgets(line,CF_BUFSIZE,pp);
fgets(line,CF_BUFSIZE,pp);
line[0] = '\0';
@ -162,7 +162,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((fp = fopen(FLNAME,"r")) == NULL)
{
@@ -1074,31 +1074,31 @@ for (i = 0; i < 7; i++)
@@ -1070,31 +1070,31 @@ for (i = 0; i < 7; i++)
}
}
@ -199,7 +199,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((FPLOAD = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1107,14 +1107,14 @@ for (i = 0; i < 7; i++)
@@ -1103,14 +1103,14 @@ for (i = 0; i < 7; i++)
for (i = 0; i < ATTR; i++)
{
@ -216,7 +216,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((FPOUT[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1124,13 +1124,13 @@ for (i = 0; i < 7; i++)
@@ -1120,13 +1120,13 @@ for (i = 0; i < 7; i++)
for (i = 0; i < CF_NETATTR; i++)
{
@ -232,7 +232,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((FPNETOUT[i] = fopen(FLNAME,"w")) == NULL)
{
@@ -1146,7 +1146,7 @@ for (i = 0; i < 7; i++)
@@ -1142,7 +1142,7 @@ for (i = 0; i < 7; i++)
continue;
}
@ -241,7 +241,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((FPPH[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1378,7 +1378,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -1374,7 +1374,7 @@ for (dirp = readdir(dirh); dirp != NULL;
memset(&key,0,sizeof(key));
memset(&value,0,sizeof(value));
@ -250,7 +250,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
key.data = TIMEKEY;
key.size = strlen(TIMEKEY)+1;
@@ -1481,7 +1481,7 @@ while ((c=getopt_long(argc,argv,"Thtf:rs
@@ -1477,7 +1477,7 @@ while ((c=getopt_long(argc,argv,"Thtf:rs
case 't': TITLES = true;
break;
@ -259,7 +259,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case 'T': TIMESTAMPS = true;
@@ -1535,7 +1535,7 @@ char *CanonifyName(char *str)
@@ -1531,7 +1531,7 @@ char *CanonifyName(char *str)
char *sp;
memset(buffer,0,CF_BUFSIZE);
@ -268,7 +268,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (sp = buffer; *sp != '\0'; sp++)
{
@@ -1607,7 +1607,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
@@ -1603,7 +1603,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
memset(&value,0,sizeof(value));
memset(&ENTRY,0,sizeof(ENTRY));

65
sysutils/cfengine/patches/patch-src_cfexecd_c
View File

@ -1,7 +1,7 @@
$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");
$OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfexecd.c.orig Mon Aug 16 22:12:46 2004
+++ src/cfexecd.c Fri Oct 1 23:14:46 2004
@@ -148,7 +148,7 @@ Banner("Check options");
NOSPLAY = false;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
openlog(VPREFIX,LOG_PID|LOG_NOWAIT|LOG_ODELAY,LOG_DAEMON);
while ((c=getopt_long(argc,argv,"L:d:vhpFV1g",CFDOPTIONS,&optindex)) != EOF)
@@ -224,7 +224,7 @@ strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
@@ -229,7 +229,7 @@ strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
VCANONICALFILE = strdup(CanonifyName(VINPUTFILE));
GetNameInfo();
@ -19,7 +19,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
@@ -408,7 +408,7 @@ if (strstr(line,"No SMTP"))
@@ -412,7 +412,7 @@ if (strstr(line,"No SMTP"))
CfLog(cferror,"Need: smtpserver = ( ?? ) in control ","");
}
@ -28,7 +28,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("Got cfengine SMTP server as (%s)\n",VMAILSERVER);
@@ -422,19 +422,19 @@ if (strlen(line) == 0)
@@ -426,19 +426,19 @@ if (strlen(line) == 0)
CfLog(cferror,"Need: sysadm = ( ??@?? ) in control ","");
}
@ -51,58 +51,68 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("Got IP (%s)\n",VIPADDRESS);
if ((ungetc(fgetc(pp), pp)) != '[')
@@ -909,21 +909,21 @@ if (!Dialogue(sd,NULL))
@@ -917,7 +917,7 @@ if (!Dialogue(sd,NULL))
goto mail_err;
}
-sprintf(VBUFF,"HELO %s\r\n",VFQNAME);
+(void)snprintf(VBUFF,sizeof(VBUFF),"HELO %s\r\n",VFQNAME);
Debug("%s",VBUFF);
if (!Dialogue(sd,VBUFF))
{
goto mail_err;
}
-sprintf(VBUFF,"MAIL FROM: <cfengine@%s>\r\n",VFQNAME);
+(void)snprintf(VBUFF,sizeof(VBUFF),"MAIL FROM: <cfengine@%s>\r\n",VFQNAME);
@@ -930,12 +930,12 @@ sscanf(to,"%*[^@]@%.64s",domain);
if (!Dialogue(sd,VBUFF))
if (strlen(domain) > 0)
{
- sprintf(VBUFF,"MAIL FROM: <cfengine@%s>\r\n",domain);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"MAIL FROM: <cfengine@%s>\r\n",domain);
Debug("%s",VBUFF);
}
else
{
- sprintf(VBUFF,"MAIL FROM: <%s>\r\n",to);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"MAIL FROM: <%s>\r\n",to);
Debug("%s",VBUFF);
}
@@ -944,7 +944,7 @@ if (!Dialogue(sd,VBUFF))
goto mail_err;
}
-sprintf(VBUFF,"RCPT TO: <%s>\r\n",to);
+(void)snprintf(VBUFF,sizeof(VBUFF),"RCPT TO: <%s>\r\n",to);
Debug("%s",VBUFF);
if (!Dialogue(sd,VBUFF))
{
@@ -937,11 +937,11 @@ if (!Dialogue(sd,"DATA\r\n"))
@@ -959,12 +959,12 @@ if (!Dialogue(sd,"DATA\r\n"))
if (anomaly)
{
- sprintf(VBUFF,"Subject: **!! (%s/%s)\r\n",VFQNAME,VIPADDRESS);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"Subject: **!! (%s/%s)\r\n",VFQNAME,VIPADDRESS);
Debug("%s",VBUFF);
}
else
{
- sprintf(VBUFF,"Subject: (%s/%s)\r\n",VFQNAME,VIPADDRESS);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"Subject: (%s/%s)\r\n",VFQNAME,VIPADDRESS);
Debug("%s",VBUFF);
}
@@ -978,10 +978,10 @@ strftime(VBUFF,CF_BUFSIZE,"Date: %a, %d
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);
#endif
-sprintf(VBUFF,"From: cfengine@%s\r\n",VFQNAME);
+(void)snprintf(VBUFF,sizeof(VBUFF),"From: cfengine@%s\r\n",VFQNAME);
Debug("%s",VBUFF);
sent=send(sd,VBUFF,strlen(VBUFF),0);
-sprintf(VBUFF,"To: %s\r\n\r\n",to);
+(void)snprintf(VBUFF,sizeof(VBUFF),"To: %s\r\n\r\n",to);
Debug("%s",VBUFF);
sent=send(sd,VBUFF,strlen(VBUFF),0);
while(!feof(fp))
@@ -964,13 +964,13 @@ while(!feof(fp))
@@ -994,14 +994,14 @@ while(!feof(fp))
if (strlen(VBUFF) > 0)
{
VBUFF[strlen(VBUFF)-1] = '\r';
@ -111,6 +121,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
count++;
sent=send(sd,VBUFF,strlen(VBUFF),0);
}
if ((MAXLINES != INF_LINES) && (count > MAXLINES))
{
- sprintf(VBUFF,"\r\n[Mail truncated by cfengine. File is at %s on %s]\r\n",file,VFQNAME);
@ -118,7 +129,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
sent=send(sd,VBUFF,strlen(VBUFF),0);
break;
}
@@ -991,7 +991,7 @@ mail_err:
@@ -1023,7 +1023,7 @@ mail_err:
fclose(fp);
close(sd);

31
sysutils/cfengine/patches/patch-src_cfrun_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/cfrun.c.orig 2004-04-17 10:11:04.000000000 -0400
+++ src/cfrun.c 2004-06-10 22:32:35.000000000 -0400
@@ -242,23 +242,23 @@ if (uname(&VSYSNAME) == -1)
$OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/cfrun.c.orig Mon Aug 2 21:46:03 2004
+++ src/cfrun.c Fri Oct 1 23:17:38 2004
@@ -245,23 +245,23 @@ if (uname(&VSYSNAME) == -1)
if ((strlen(VDOMAIN) > 0) && !strchr(VSYSNAME.nodename,'.'))
{
@ -15,7 +15,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
*/
Debug("FQNAME = %s\n",VFQNAME);
Debug("FQNAME = %s\n",VFQNAME);
-sprintf(VPREFIX,"cfrun:%s",VFQNAME);
+(void)snprintf(VPREFIX,40,"cfrun:%s",VFQNAME);
@ -30,7 +30,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -292,7 +292,7 @@ CONN = NewAgentConn();
@@ -294,7 +294,7 @@ CONN = NewAgentConn();
if (storeinfile)
{
@ -39,7 +39,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if ((fp = fopen(filebuffer, "w")) == NULL)
{
return false;
@@ -562,10 +562,10 @@ if (!strchr(VCFRUNHOSTS, '/'))
@@ -564,10 +564,10 @@ if (!strchr(VCFRUNHOSTS, '/'))
{
if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
@ -52,7 +52,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
}
else
@@ -574,7 +574,7 @@ if (!strchr(VCFRUNHOSTS, '/'))
@@ -576,7 +576,7 @@ if (!strchr(VCFRUNHOSTS, '/'))
}
}
@ -61,7 +61,16 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if ((fp = fopen(filename,"r")) == NULL) /* Open root file */
{
@@ -687,8 +687,8 @@ while (!feof(fp))
@@ -601,7 +601,7 @@ while (!feof(fp))
if (strncmp(line,"hostnamekeys",6) == 0)
{
- char buf[16];
+ char buf[296];
buf[0] = '\0';
sscanf(line,"hostnamekeys = %295[^# \n]",buf);
Verbose("Hostname keys\n");
@@ -703,8 +703,8 @@ while (!feof(fp))
if ((!strstr(buffer,".")) && (strlen(VDOMAIN) > 0))
{
@ -72,7 +81,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
if (!IsItemIn(VCFRUNHOSTLIST,buffer))
@@ -746,8 +746,8 @@ for (ip = VCFRUNCLASSES; ip != NULL; ip
@@ -762,8 +762,8 @@ for (ip = VCFRUNCLASSES; ip != NULL; ip
memset(sendbuffer,0,CF_BUFSIZE);
}
@ -83,7 +92,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
sp += strlen(ip->name)+1;
used += strlen(ip->name)+1;
@@ -766,7 +766,7 @@ if (used + strlen(CFD_TERMINATOR) +2 > C
@@ -782,7 +782,7 @@ if (used + strlen(CFD_TERMINATOR) +2 > C
memset(sendbuffer,0,CF_BUFSIZE);
}

40
sysutils/cfengine/patches/patch-src_cfservd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/cfservd.c.orig 2004-04-17 10:11:16.000000000 -0400
+++ src/cfservd.c 2004-06-12 23:42:42.000000000 -0400
@@ -164,10 +164,10 @@ void CheckOptsAndInit(int argc,char **ar
$OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/cfservd.c.orig Fri Aug 13 11:08:25 2004
+++ src/cfservd.c Fri Oct 1 23:14:47 2004
@@ -172,10 +172,10 @@ void CheckOptsAndInit(int argc,char **ar
int c;
SetContext("server");
@ -15,7 +15,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
OUTPUT[0] = '\0';
/*
@@ -269,7 +269,7 @@ strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
@@ -277,7 +277,7 @@ strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
VIFELAPSED = CF_EXEC_IFELAPSED;
VEXPIREAFTER = CF_EXEC_EXPIREAFTER;
@ -24,7 +24,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
VCANONICALFILE = strdup(CanonifyName(VINPUTFILE));
VREPOSITORY = strdup("\0");
@@ -981,7 +981,7 @@ if (CFDSTARTTIME < newstat.st_mtime)
@@ -1024,7 +1024,7 @@ if (CFDSTARTTIME < newstat.st_mtime)
DeleteItemList(TRUSTKEYLIST);
DeleteAuthList(VADMIT);
DeleteAuthList(VDENY);
@ -33,7 +33,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
VADMIT = VADMITTOP = NULL;
VDENY = VDENYTOP = NULL;
@@ -1355,7 +1355,7 @@ switch (GetCommand(recvbuffer))
@@ -1401,7 +1401,7 @@ switch (GetCommand(recvbuffer))
if ((tloc = time((time_t *)NULL)) == -1)
{
@ -42,7 +42,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cfinform,conn->output,"time");
SendTransaction(conn->sd_reply,"BAD: clocks out of synch",0,CF_DONE);
return true;
@@ -1420,7 +1420,7 @@ switch (GetCommand(recvbuffer))
@@ -1466,7 +1466,7 @@ switch (GetCommand(recvbuffer))
}
@ -51,7 +51,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
CfLog(cfinform,"Closing connection\n","");
return false;
@@ -1528,7 +1528,7 @@ if ((CFSTARTTIME = time((time_t *)NULL))
@@ -1574,7 +1574,7 @@ if ((CFSTARTTIME = time((time_t *)NULL))
if (GetMacroValue(CONTEXTID,"cfrunCommand") == NULL)
{
Verbose("cfservd exec request: no cfrunCommand defined\n");
@ -60,7 +60,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return;
}
@@ -1569,8 +1569,8 @@ else
@@ -1615,8 +1615,8 @@ else
{
if ((args != NULL) & (strlen(args) > 0))
{
@ -71,7 +71,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
snprintf(sendbuffer,CF_BUFSIZE,"cfservd Executing %s\n",ebuff);
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
@@ -2377,7 +2377,7 @@ if (S_ISLNK(statbuf.st_mode))
@@ -2483,7 +2483,7 @@ if (S_ISLNK(statbuf.st_mode))
if (readlink(filename,linkbuf,CF_BUFSIZE-1) == -1)
{
@ -80,7 +80,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,sendbuffer,"readlink");
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return -1;
@@ -2480,12 +2480,12 @@ SendTransaction(conn->sd_reply,sendbuffe
@@ -2586,12 +2586,12 @@ SendTransaction(conn->sd_reply,sendbuffe
if (cfst.cf_readlink != NULL)
{
@ -96,7 +96,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
@@ -2687,13 +2687,13 @@ memset(sendbuffer,0,CF_BUFSIZE);
@@ -2793,13 +2793,13 @@ memset(sendbuffer,0,CF_BUFSIZE);
if (ChecksumChanged(filename,digest,cfverbose,true,'m'))
{
@ -112,7 +112,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
Debug("Checksums matched ok\n");
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
}
@@ -2711,7 +2711,7 @@ Debug("CfOpenDirectory(%s)\n",dirname);
@@ -2817,7 +2817,7 @@ Debug("CfOpenDirectory(%s)\n",dirname);
if (*dirname != '/')
{
@ -121,7 +121,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return -1;
}
@@ -2743,7 +2743,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2849,7 +2849,7 @@ for (dirp = readdir(dirh); dirp != NULL;
offset += strlen(dirp->d_name) + 1; /* + zero byte separator */
}
@ -130,7 +130,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,offset+2+strlen(CFD_TERMINATOR),CF_DONE);
Debug("END CfOpenDirectory(%s)\n",dirname);
closedir(dirh);
@@ -2758,7 +2758,7 @@ void Terminate(int sd)
@@ -2864,7 +2864,7 @@ void Terminate(int sd)
memset(buffer,0,CF_BUFSIZE);
@ -139,7 +139,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (SendTransaction(sd,buffer,strlen(buffer)+1,CF_DONE) == -1)
{
@@ -2977,7 +2977,7 @@ Debug("Checking to see if we have seen t
@@ -3083,7 +3083,7 @@ Debug("Checking to see if we have seen t
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -148,7 +148,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return false;
}
@@ -2988,7 +2988,7 @@ if ((errno = dbp->open(dbp,keydb,NULL,DB
@@ -3094,7 +3094,7 @@ if ((errno = dbp->open(dbp,keydb,NULL,DB
if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -157,7 +157,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return false;
}
@@ -3061,7 +3061,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
@@ -3167,7 +3167,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -166,7 +166,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -3072,7 +3072,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
@@ -3178,7 +3178,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{

8
sysutils/cfengine/patches/patch-src_crypto_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_crypto_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/crypto.c.orig 2004-04-17 10:11:17.000000000 -0400
+++ src/crypto.c 2004-06-10 15:47:30.000000000 -0400
$OpenBSD: patch-src_crypto_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/crypto.c.orig Wed Aug 11 22:55:51 2004
+++ src/crypto.c Fri Oct 1 23:14:47 2004
@@ -49,11 +49,11 @@ snprintf(VBUFF,CF_BUFSIZE,"%s/randseed",
if (stat(VBUFF,&statbuf) == -1)
@ -15,7 +15,7 @@ $OpenBSD: patch-src_crypto_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
Verbose("Looking for a source of entropy in %s\n",AVDB);
@@ -291,7 +291,7 @@ snprintf(buffer,CF_BUFSIZE,"%d%d%25s",(i
@@ -294,7 +294,7 @@ snprintf(buffer,CF_BUFSIZE,"%d%d%25s",(i
EVP_DigestUpdate(&context,buffer,CF_BUFSIZE);

72
sysutils/cfengine/patches/patch-src_do_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/do.c.orig Sun Aug 15 07:38:39 2004
+++ src/do.c Fri Oct 1 23:14:47 2004
@@ -76,9 +76,9 @@ for (ip = VMOUNTLIST; ip != NULL; ip=ip-
continue;
}
@ -13,7 +13,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (IsHomeDir(VBUFF))
{
@@ -230,13 +230,13 @@ do
@@ -231,13 +231,13 @@ do
case crayos:
if (buf1[0] == '/')
{
@ -30,7 +30,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -246,13 +246,13 @@ do
@@ -247,13 +247,13 @@ do
case hp:
if (buf3[0] == '/')
{
@ -47,7 +47,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -261,18 +261,18 @@ do
@@ -262,18 +262,18 @@ do
if (buf1[0] == '/')
{
@ -72,7 +72,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case unused1:
case unused2:
@@ -344,12 +344,12 @@ for (ptr = VMAKEPATH; ptr != NULL; ptr=p
@@ -345,12 +345,12 @@ for (ptr = VMAKEPATH; ptr != NULL; ptr=p
pathbuff[0]='\0';
basename[0]='\0';
@ -89,7 +89,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ExpandWildCardsAndDo(pathbuff,basename,DirectoriesWrapper,ptr);
}
@@ -633,7 +633,7 @@ if (strcmp(VDEFAULTBINSERVER.name,mailho
@@ -634,7 +634,7 @@ if (strcmp(VDEFAULTBINSERVER.name,mailho
return;
}
@ -98,7 +98,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (IsItemIn(VMOUNTED,lmailpath)) /* Remote file system mounted on */
@@ -643,9 +643,9 @@ if (IsItemIn(VMOUNTED,lmailpath))
@@ -644,9 +644,9 @@ if (IsItemIn(VMOUNTED,lmailpath))
return;
}
@ -110,7 +110,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
MakeDirectoriesFor(mailserver,'n'); /* Check directory is in place */
@@ -713,9 +713,9 @@ if (always || (strncmp(VMAILSERVER,VFQNA
@@ -714,9 +714,9 @@ if (always || (strncmp(VMAILSERVER,VFQNA
continue;
}
@ -122,7 +122,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (stat(VBUFF,&statbuf) != -1)
{
@@ -1190,9 +1190,9 @@ if (!IsPrivileged())
@@ -1189,9 +1189,9 @@ if (!IsPrivileged())
}
pathbuff[0]='\0';
basename[0]='\0';
@ -134,7 +134,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ExpandWildCardsAndDo(pathbuff,basename,RecHomeTidyWrapper,NULL);
}
@@ -1429,6 +1429,7 @@ void GetSetuidLog()
@@ -1428,6 +1428,7 @@ void GetSetuidLog()
struct Item *ip;
FILE *fp;
char *sp;
@ -142,7 +142,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (!IsPrivileged()) /* Ignore this if not root */
{
@@ -1455,7 +1456,8 @@ else
@@ -1454,7 +1455,8 @@ else
FatalError("GetSetuidList() couldn't allocate memory #1");
}
@ -152,7 +152,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
{
perror("malloc");
FatalError("GetSetuidList() couldn't allocate memory #2");
@@ -1472,7 +1474,7 @@ else
@@ -1471,7 +1473,7 @@ else
Debug2("SETUID-LOG: %s\n",VBUFF);
@ -161,7 +161,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ip->name = sp;
ip->next = NULL;
filetop = ip;
@@ -1767,7 +1769,7 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
@@ -1766,7 +1768,7 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
}
else
{
@ -170,7 +170,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ChopLastNode(path);
AddSlash(path);
if (BufferOverflow(path,dp->destination))
@@ -1778,13 +1780,13 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
@@ -1777,13 +1779,13 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
ReleaseCurrentLock();
continue;
}
@ -187,7 +187,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
snprintf(OUTPUT,CF_BUFSIZE*2,"Disabling/renaming file %s to %s\n",workname,path);
@@ -1912,15 +1914,15 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
@@ -1911,15 +1913,15 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
Debug("Mount: checking %s\n",mp->filesystem);
@ -206,7 +206,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
if (strcmp(host,VDEFAULTBINSERVER.name) == 0) /* A host never mounts itself nfs */
@@ -1932,11 +1934,11 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
@@ -1931,11 +1933,11 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
/* HvB: Bas van der Vlies */
if ( mp->readonly )
{
@ -220,7 +220,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
if (IsHomeDir(mountdir))
@@ -2006,15 +2008,15 @@ for (mp = VMISCMOUNT; mp != NULL; mp=mp-
@@ -2005,15 +2007,15 @@ for (mp = VMISCMOUNT; mp != NULL; mp=mp-
mp->done = 'y';
}
@ -239,7 +239,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
if (strcmp(host,VDEFAULTBINSERVER.name) == 0) /* A host never mounts itself nfs */
@@ -2168,8 +2170,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
@@ -2167,8 +2169,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
{
if (VSYSTEMHARDCLASS == aix)
{
@ -250,7 +250,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
item = LocateNextItemContaining(filelist,VBUFF);
@@ -2193,8 +2195,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
@@ -2192,8 +2194,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
if (VSYSTEMHARDCLASS == ultrx) /* ensure name is not just a substring */
{
@ -261,7 +261,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
DeleteItemContaining(&filelist,VBUFF);
}
else
@@ -2585,14 +2587,14 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2583,14 +2585,14 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
#ifdef NT
tzset();
@ -278,7 +278,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
#else
@@ -2600,7 +2602,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2598,7 +2600,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
{
printf("Couldn't read system clock\n\n");
}
@ -287,7 +287,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
#endif /* SUN4 */
#endif /* AOS */
@@ -2840,14 +2842,14 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2841,14 +2843,14 @@ if (S_ISDIR(statbuf.st_mode))
filecount++;
@ -305,7 +305,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (lstat(buff,&localstat) == -1)
{
@@ -2875,14 +2877,14 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2876,14 +2878,14 @@ if (S_ISDIR(statbuf.st_mode))
if (sizeinbytes < SENSIBLEFSSIZE)
{
@ -322,7 +322,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
CfLog(cferror,OUTPUT,"");
return(false);
}
@@ -2930,7 +2932,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2931,7 +2933,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -331,7 +331,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddSlash(pcwd);
if (BufferOverflow(pcwd,dirp->d_name))
@@ -2939,7 +2941,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2940,7 +2942,7 @@ for (dirp = readdir(dirh); dirp != NULL;
return true;
}
@ -340,7 +340,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (lstat(dirp->d_name,&statbuf) == -1)
{
@@ -2983,9 +2985,9 @@ void InstallMountedItem(char *host,char
@@ -2984,9 +2986,9 @@ void InstallMountedItem(char *host,char
{ char buf[CF_BUFSIZE];
@ -353,7 +353,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (IsItemIn(VMOUNTED,buf))
{
@@ -3087,16 +3089,16 @@ if (MatchStringInFstab(mountpt))
@@ -3089,16 +3091,16 @@ if (MatchStringInFstab(mountpt))
CfLog(cfinform,"---------------------------------------------------","");
/* delete current fstab entry and unmount if necessary */
@ -374,7 +374,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
/* delete current fstab entry and unmount if necessary (don't rmdir) */
cleaner.name = mountspec;
@@ -3245,14 +3247,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3247,14 +3249,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
pathbuff[0]='\0';
basename[0]='\0';
@ -392,7 +392,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddSlash(pathbuff);
if (*(ptr->path+4) != '/')
@@ -3263,7 +3265,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3265,7 +3267,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
else
{
@ -401,7 +401,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
ExpandWildCardsAndDo(pathbuff,basename,RecFileCheck,ptr);
@@ -3294,11 +3296,11 @@ void EditItemsInResolvConf(struct Item *
@@ -3296,11 +3298,11 @@ void EditItemsInResolvConf(struct Item *
if (isdigit((int)*(work)))
{
@ -415,7 +415,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
DeleteItemMatching(list,buf); /* del+prep = move to head of list */
@@ -3370,7 +3372,7 @@ if (strlen(extract) == 0)
@@ -3372,7 +3374,7 @@ if (strlen(extract) == 0)
{
if (isdir)
{
@ -424,7 +424,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
(*function)(buffer,argptr);
return;
@@ -3378,20 +3380,20 @@ if (strlen(extract) == 0)
@@ -3380,20 +3382,20 @@ if (strlen(extract) == 0)
if (! IsWildCard(extract))
{
@ -448,7 +448,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((dirh=opendir(buffer)) == NULL)
{
@@ -3401,7 +3403,7 @@ else
@@ -3403,7 +3405,7 @@ else
}
count = 0;
@ -457,7 +457,7 @@ $OpenBSD: patch-src_do_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (dp = readdir(dirh); dp != 0; dp = readdir(dirh))
{
@@ -3411,8 +3413,8 @@ else
@@ -3413,8 +3415,8 @@ else
}
count++;

14
sysutils/cfengine/patches/patch-src_edittools_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/edittools.c.orig Wed Aug 11 22:50:07 2004
+++ src/edittools.c Fri Oct 1 23:14:47 2004
@@ -74,7 +74,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -65,7 +65,7 @@ $OpenBSD: patch-src_edittools_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (!FileObjectFilter(realname,&statbuf2,ptr->filters,editfiles))
{
@@ -402,8 +402,8 @@ NUMBEROFEDITS = 0;
@@ -401,8 +401,8 @@ NUMBEROFEDITS = 0;
EDITVERBOSE = VERBOSE;
CURRENTLINENUMBER = 1;
CURRENTLINEPTR = filestart;
@ -76,7 +76,7 @@ $OpenBSD: patch-src_edittools_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
EDITGROUPLEVEL = 0;
SEARCHREPLACELEVEL = 0;
FOREACHLEVEL = 0;
@@ -1330,6 +1330,7 @@ return true;
@@ -1329,6 +1329,7 @@ return true;
int ReplaceEditLineWith (char *string)
{ char *sp;
@ -84,7 +84,7 @@ $OpenBSD: patch-src_edittools_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (strcmp(string,CURRENTLINEPTR->name) == 0)
{
@@ -1337,14 +1338,15 @@ if (strcmp(string,CURRENTLINEPTR->name)
@@ -1336,14 +1337,15 @@ if (strcmp(string,CURRENTLINEPTR->name)
return true;
}
@ -102,7 +102,7 @@ $OpenBSD: patch-src_edittools_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
free (CURRENTLINEPTR->name);
CURRENTLINEPTR->name = sp;
NUMBEROFEDITS++;
@@ -2050,10 +2052,10 @@ int SaveBinaryFile(char *file,off_t size
@@ -2048,10 +2050,10 @@ int SaveBinaryFile(char *file,off_t size
Debug("SaveBinaryFile(%s,%d)\n",file,size);
Verbose("Saving %s\n",file);

20
sysutils/cfengine/patches/patch-src_eval_c
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-src_eval_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/eval.c.orig Wed Aug 11 00:50:29 2004
+++ src/eval.c Fri Oct 1 23:14:47 2004
@@ -253,7 +253,7 @@ sscanf(str,"%*s %s %s %s %s",buf2,buf3,b
/* Hours */
sscanf(buf4,"%[^:]",buf);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(out);
memset(VHR,0,3);
strncpy(VHR,buf,2);
@@ -220,7 +220,7 @@ strncpy(VHR,buf,2);
@@ -261,7 +261,7 @@ strncpy(VHR,buf,2);
/* Minutes */
sscanf(buf4,"%*[^:]:%[^:]",buf);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(out);
memset(VMINUTE,0,3);
strncpy(VMINUTE,buf,2);
@@ -260,19 +260,19 @@ switch ((i / 5))
@@ -301,19 +301,19 @@ switch ((i / 5))
switch ((i / 15))
{
case 0: AddClassToHeap("Q1");
@ -43,7 +43,7 @@ $OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(out);
break;
}
@@ -280,7 +280,7 @@ switch ((i / 15))
@@ -321,7 +321,7 @@ switch ((i / 15))
/* Day */
@ -52,7 +52,7 @@ $OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(out);
memset(VDAY,0,3);
strncpy(VDAY,buf3,2);
@@ -300,9 +300,9 @@ for (i = 0; i < 12; i++)
@@ -341,9 +341,9 @@ for (i = 0; i < 12; i++)
/* Year */
@ -64,7 +64,7 @@ $OpenBSD: patch-src_eval_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(out);
}
@@ -548,7 +548,7 @@ while(*sp != '\0')
@@ -589,7 +589,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.2 2004/08/08 14:02:11 sturm Exp $
FatalError(err);
}
@@ -858,7 +858,7 @@ for (sp = class; *sp != '\0'; sp++)
@@ -899,7 +899,7 @@ for (sp = class; *sp != '\0'; sp++)
if (bracklevel != 0)
{

161
sysutils/cfengine/patches/patch-src_functions_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/functions.c.orig Mon Aug 16 22:41:21 2004
+++ src/functions.c Fri Oct 1 23:14:47 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.2 2004/08/08 14:02:11 sturm Exp $
return value;
}
}
@@ -316,46 +316,46 @@ if (strchr(args,','))
@@ -318,46 +318,46 @@ if (strchr(args,','))
if (lstat(args,&statbuf) == -1)
{
@ -71,7 +71,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*********************************************************************/
@@ -370,7 +370,7 @@ if (strchr(args,','))
@@ -372,7 +372,7 @@ if (strchr(args,','))
return;
}
@ -80,41 +80,56 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (!FuzzyMatchParse(args))
{
@@ -379,7 +379,7 @@ if (!FuzzyMatchParse(args))
@@ -387,7 +387,7 @@ for (ip = IPADDRESSES; ip != NULL; ip =
if (FuzzySetMatch(args,ip->name) == 0)
{
Debug("IPRange Matched\n");
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
return;
}
}
@@ -398,12 +398,12 @@ Debug("Checking IP Range against RDNS %s
if (FuzzySetMatch(args,VIPADDRESS) == 0)
{
Debug("IPRange Matched\n");
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
return;
}
Debug("IPRange did not match\n");
-strcpy(value,CF_NOCLASS);
+(void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
/*********************************************************************/
@@ -416,7 +416,7 @@ Debug("SRDEBUG args=%s value=%s\n",args,
if (!FuzzyHostParse(args))
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
return;
}
/* VDEFAULTBINSERVER.name is relative domain name */
@@ -425,12 +425,12 @@ if (!FuzzyHostParse(args))
if (FuzzyHostMatch(args,VDEFAULTBINSERVER.name) == 0)
{
Debug("SRDEBUG SUCCESS!\n");
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
}
@@ -394,7 +394,7 @@ void HandleHostRange(char *args,char *va
if (!FuzzyHostParse(args))
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
return;
}
/* VDEFAULTBINSERVER.name is relative domain name */
@@ -403,12 +403,12 @@ void HandleHostRange(char *args,char *va
if (FuzzyHostMatch(args,VDEFAULTBINSERVER.name) == 0)
{
Debug("SRDEBUG SUCCESS!\n");
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
else
{
Debug("SRDEBUG FAILURE\n");
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
else
{
Debug("SRDEBUG FAILURE\n");
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
return;
@@ -423,7 +423,7 @@ void HandleCompareStat(enum builtin fn,c
int count = 0;
return;
@@ -444,7 +444,7 @@ void HandleCompareStat(enum builtin fn,c
char argv[CF_MAXFARGS][CF_MAXVARSIZE];
FunctionArgs(args,argv,2);
-strcpy(value,CF_NOCLASS);
@ -122,7 +137,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (stat(argv[0],&frombuf) == -1)
{
@@ -440,7 +440,7 @@ switch(fn)
@@ -461,7 +461,7 @@ switch(fn)
case fn_newerthan:
if (frombuf.st_mtime < tobuf.st_mtime)
{
@ -131,7 +146,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
break;
@@ -448,7 +448,7 @@ switch(fn)
@@ -469,7 +469,7 @@ switch(fn)
case fn_accessedbefore:
if (frombuf.st_atime < tobuf.st_atime)
{
@ -140,7 +155,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
break;
@@ -456,13 +456,13 @@ switch(fn)
@@ -477,13 +477,13 @@ switch(fn)
case fn_changedbefore:
if (frombuf.st_ctime < tobuf.st_ctime)
{
@ -156,7 +171,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
@@ -509,7 +509,7 @@ if (*args == '/')
@@ -530,7 +530,7 @@ if (*args == '/')
if (ShellCommandReturnsZero(command))
{
@ -165,7 +180,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
}
@@ -518,7 +518,7 @@ if (*args == '/')
@@ -539,7 +539,7 @@ if (*args == '/')
yyerror("ExecResult(/command) must specify an absolute path");
}
@ -174,7 +189,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
@@ -536,11 +536,11 @@ Debug("HandleIsDefined(%s)\n",args);
@@ -557,11 +557,11 @@ Debug("HandleIsDefined(%s)\n",args);
if (GetMacroValue(CONTEXTID,args))
{
@ -188,7 +203,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*********************************************************************/
@@ -556,7 +556,7 @@ value[0] = '\0';
@@ -577,7 +577,7 @@ value[0] = '\0';
if (PARSING)
{
@ -197,7 +212,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -611,11 +611,11 @@ FunctionArgs(args,argv,2);
@@ -631,11 +631,11 @@ FunctionArgs(args,argv,2);
if (strcmp(argv[0],argv[1]) == 0)
{
@ -211,7 +226,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
}
@@ -641,11 +641,11 @@ ret = LocateNextItemMatching(list,argv[0
@@ -660,11 +660,11 @@ ret = LocateNextItemMatching(list,argv[0
if (ret != NULL)
{
@ -225,69 +240,61 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
DeleteItemList(list);
@@ -985,7 +985,7 @@ first[0] = '\0';
@@ -1009,7 +1009,7 @@ first[0] = '\0';
if (psize < 2)
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
+ (void)strlcpy(value,"silly",CF_EXPANDSIZE);
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -994,7 +994,7 @@ Verbose("Searching for my peer group in
@@ -1018,7 +1018,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);
+ (void)strlcpy(value,"silly",CF_EXPANDSIZE);
CfLog(cferror,"Partition leader policy is first/random only","");
return;
}
@@ -1149,7 +1149,7 @@ value[0] = '\0';
@@ -1173,7 +1173,7 @@ value[0] = '\0';
if (psize < 2)
{
- strcpy(value,"silly");
+ (void)strlcpy(value,"silly",CF_BUFSIZE);
+ (void)strlcpy(value,"silly",CF_EXPANDSIZE);
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -1158,7 +1158,7 @@ Verbose("Searching for my peer group nei
@@ -1182,7 +1182,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);
+ (void)strlcpy(value,"silly",CF_EXPANDSIZE);
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");
}
@@ -1305,7 +1305,7 @@ for (ip = SplitStringAsItemList(args,','
AppendItem(&METHODRETURNVARS,args,CLASSBUFF);
}
-strcpy(value,"noinstall");
+(void)strlcpy(value,"noinstall",CF_EXPANDSIZE);
}
/*********************************************************************/
@@ -1321,7 +1321,7 @@ for (ip = SplitStringAsItemList(args,','
AppendItem(&METHODRETURNCLASSES,args,CLASSBUFF);
}
-strcpy(value,"noinstall");
+(void)strlcpy(value,"noinstall",CF_EXPANDSIZE);
}
/*********************************************************************/
@@ -1298,14 +1298,14 @@ Verbose("This is a method with return cl
if (strlen(METHODRETURNCLASSES) == 0)
{
- strncpy(METHODRETURNCLASSES,args,CF_BUFSIZE-1);
+ strlcpy(METHODRETURNCLASSES,args,sizeof(METHODRETURNCLASSES));
}
else
{
yyerror("Redefinition of method return classes");
}
- strcpy(value,"noinstall");
+ (void)strlcpy(value,"noinstall",CF_EXPANDSIZE);
}
/*********************************************************************/
@@ -1331,7 +1331,7 @@ Debug("ShowState(%s)\n",args);
@@ -1347,7 +1347,7 @@ Debug("ShowState(%s)\n",args);
if (PARSING)
{
@ -296,7 +303,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -1516,12 +1516,12 @@ if (stat(buffer,&statbuf) == 0)
@@ -1532,12 +1532,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));
@ -311,7 +318,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
DeleteItemList(addresses);
@@ -1548,7 +1548,7 @@ FunctionArgs(args,argv,1);
@@ -1564,7 +1564,7 @@ FunctionArgs(args,argv,1);
if (PARSING)
{
@ -320,7 +327,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -1559,7 +1559,7 @@ if (time >= 0)
@@ -1575,7 +1575,7 @@ if (time >= 0)
CheckFriendConnections(time);
}
@ -329,7 +336,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*********************************************************************/
@@ -1629,11 +1629,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
@@ -1648,11 +1648,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
if (CheckForModule(argv[0],argv[1]))
{
@ -343,7 +350,7 @@ $OpenBSD: patch-src_functions_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
}
@@ -1671,7 +1671,7 @@ if (strchr(args,','))
@@ -1690,7 +1690,7 @@ if (strchr(args,','))
return;
}

14
sysutils/cfengine/patches/patch-src_image_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/image.c.orig Thu Aug 12 22:16:20 2004
+++ src/image.c Fri Oct 1 23:14:48 2004
@@ -57,8 +57,8 @@ Banner("Looking for remote method collab
}
else
@ -117,7 +117,7 @@ $OpenBSD: patch-src_image_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ImageCopy(sourcefile,destfile,sourcestatbuf,ip);
(ip->uid)->uid = save_uid;
@@ -1005,7 +1005,7 @@ if (ip->linktype != 'n')
@@ -1007,7 +1007,7 @@ if (ip->linktype != 'n')
if (ip->linktype == 'a' && linkbuf[0] != '/') /* Not absolute path - must fix */
{
@ -126,7 +126,7 @@ $OpenBSD: patch-src_image_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ChopLastNode(VBUFF);
AddSlash(VBUFF);
strncat(VBUFF,linkbuf,CF_BUFSIZE-1);
@@ -1381,7 +1381,7 @@ for (sp = ip->cache; sp != NULL; sp=sp->
@@ -1383,7 +1383,7 @@ for (sp = ip->cache; sp != NULL; sp=sp->
else
{
memset(linkbuf,0,buffsize);
@ -135,7 +135,7 @@ $OpenBSD: patch-src_image_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return 0;
}
}
@@ -1569,13 +1569,13 @@ if (BufferOverflow(dest,CF_NEW))
@@ -1571,13 +1571,13 @@ if (BufferOverflow(dest,CF_NEW))
printf(" culprit: CopyReg\n");
return false;
}
@ -151,7 +151,7 @@ $OpenBSD: patch-src_image_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (remote)
{
@@ -1614,22 +1614,22 @@ if (IMAGEBACKUP != 'n')
@@ -1616,22 +1616,22 @@ if (IMAGEBACKUP != 'n')
time_t STAMPNOW;
STAMPNOW = time((time_t *)NULL);

77
sysutils/cfengine/patches/patch-src_install_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/install.c.orig Wed Aug 11 22:50:46 2004
+++ src/install.c Fri Oct 1 23:14:48 2004
@@ -106,7 +106,7 @@ else
FatalError("Redefinition of basic system variable");
}
@ -175,20 +175,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfcmp: CMPSENSE = (enum cmpsense) GetCmpSense(value);
break;
@@ -1376,10 +1376,10 @@ if (value[0] == '\0')
strncpy(METHODFILENAME,value,CF_BUFSIZE-1);
break;
case cfretclasses:
- strncpy(METHODRETURNCLASSES,value,CF_BUFSIZE-1);
+ (void)strlcpy(METHODRETURNCLASSES,value,sizeof(METHODRETURNCLASSES));
break;
case cfforcereplyto:
- strncpy(METHODFORCE,value,CF_BUFSIZE-1);
+ (void)strlcpy(METHODFORCE,value,sizeof(METHODFORCE));
break;
case cfsendclasses:
strncpy(METHODREPLYTO,value,CF_MAXVARSIZE-1);
@@ -1440,9 +1440,9 @@ switch(GetCommAttribute(item))
@@ -1454,9 +1454,9 @@ switch(GetCommAttribute(item))
break;
case cfsetinform: HandleCharSwitch("inform",value,&INFORMP);
break;
@ -200,7 +187,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfdefine: HandleDefine(value);
break;
@@ -1508,7 +1508,7 @@ if (!IsAbsoluteFileName(value))
@@ -1522,7 +1522,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -209,7 +196,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*******************************************************************/
@@ -1521,7 +1521,7 @@ if (!IsAbsoluteFileName(value))
@@ -1535,7 +1535,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -218,7 +205,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*******************************************************************/
@@ -1532,7 +1532,7 @@ void HandleFileItem(char *item)
@@ -1546,7 +1546,7 @@ void HandleFileItem(char *item)
if (strcmp(item,"home") == 0)
{
ACTIONPENDING=true;
@ -227,7 +214,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -1562,19 +1562,19 @@ if (VBROADCAST[0] != '\0')
@@ -1576,19 +1576,19 @@ if (VBROADCAST[0] != '\0')
if (strcmp("ones",item) == 0)
{
@ -250,7 +237,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -1617,12 +1617,12 @@ ExpandVarstring(item,ebuff,NULL);
@@ -1631,12 +1631,12 @@ ExpandVarstring(item,ebuff,NULL);
else
{
memcpy(&inaddr,hp->h_addr, hp->h_length);
@ -265,7 +252,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
}
@@ -1906,7 +1906,7 @@ if (VMAILSERVER[0] != '\0')
@@ -1874,7 +1874,7 @@ if (VMAILSERVER[0] != '\0')
FatalError("Redefinition of mailserver");
}
@ -274,7 +261,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug1("Installing mailserver (%s) for group (%s)",path,GROUPBUFF);
}
@@ -2622,9 +2622,9 @@ switch (action)
@@ -2592,9 +2592,9 @@ switch (action)
{
switch (MOUNTMODE)
{
@ -286,7 +273,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
default: printf("Install pending, miscmount, shouldn't happen\n");
MOUNTOPTS[0] = '\0'; /* no mount mode set! */
@@ -2640,8 +2640,8 @@ switch (action)
@@ -2610,8 +2610,8 @@ switch (action)
MOUNTFROM, MOUNTONTO);
return;
}
@ -297,7 +284,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
AppendMiscMount(MOUNTFROM,MOUNTONTO,MOUNTOPTS);
}
@@ -3500,11 +3500,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
@@ -3470,11 +3470,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
if (strlen(type) == 0)
{
@ -311,7 +298,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
if ((ptr->type = strdup(ebuff)) == NULL)
@@ -3629,7 +3629,7 @@ if (!strstr(function,"("))
@@ -3602,7 +3602,7 @@ if (!strstr(function,"("))
}
/* First look at bare args to cache an arg fingerprint */
@ -320,7 +307,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (work[strlen(work)-1] != ')')
{
@@ -4824,12 +4824,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
@@ -4796,12 +4796,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
if (strlen(action) == 0) /* default action */
{
@ -335,7 +322,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
yyerror(VBUFF);
return;
}
@@ -4937,7 +4937,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
@@ -4901,7 +4901,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
if (strlen(destination) == 0)
{
@ -344,7 +331,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -5245,11 +5245,11 @@ if (strlen(CURRENTITEM) != 0)
@@ -5217,11 +5217,11 @@ if (strlen(CURRENTITEM) != 0)
if (strcmp(value,"link") == 0 || strcmp(value,"links") == 0)
{
@ -358,7 +345,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -5368,7 +5368,7 @@ void HandleNetmask(char *value)
@@ -5340,7 +5340,7 @@ void HandleNetmask(char *value)
{
if (strlen(DESTINATION) == 0)
{
@ -367,7 +354,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -5383,7 +5383,7 @@ void HandleIPAddress(char *value)
@@ -5355,7 +5355,7 @@ void HandleIPAddress(char *value)
{
if (strlen(LINKTO) == 0)
{
@ -376,7 +363,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -5404,19 +5404,19 @@ if (strlen(CURRENTOBJECT) != 0)
@@ -5376,19 +5376,19 @@ if (strlen(CURRENTOBJECT) != 0)
if (strcmp("ones",value) == 0)
{
@ -399,7 +386,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
@@ -5429,6 +5429,7 @@ void AppendToActionSequence (char *actio
@@ -5401,6 +5401,7 @@ void AppendToActionSequence (char *actio
{ int j = 0;
char *sp,cbuff[CF_BUFSIZE],actiontxt[CF_BUFSIZE];
@ -407,7 +394,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug1("Installing item (%s) in the action sequence list\n",action);
@@ -5460,8 +5461,10 @@ while (*sp != '\0')
@@ -5432,8 +5433,10 @@ while (*sp != '\0')
if (IsHardClass(cbuff))
{
@ -420,7 +407,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
yyerror(tmp);
free(tmp);
yyerror("You cannot add a reserved class!");
@@ -5470,7 +5473,7 @@ while (*sp != '\0')
@@ -5442,7 +5445,7 @@ while (*sp != '\0')
if (j == 1)
{
@ -429,7 +416,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
continue;
}
else if (!IsSpecialClass(cbuff))
@@ -5497,7 +5500,7 @@ if (isalpha((int)user[0]))
@@ -5469,7 +5472,7 @@ if (isalpha((int)user[0]))
return;
}
@ -438,7 +425,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AppendItem(&VACCESSLIST,id,NULL);
}
else
@@ -5595,7 +5598,7 @@ void HandleServer(char *value)
@@ -5567,7 +5570,7 @@ void HandleServer(char *value)
{
Debug("Server in copy set to : %s\n",value);
@ -447,7 +434,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*******************************************************************/
@@ -5617,7 +5620,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5589,7 +5592,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror(OUTPUT);
}
*/
@ -456,7 +443,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5647,7 +5650,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5619,7 +5622,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -465,7 +452,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5677,7 +5680,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5649,7 +5652,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -474,7 +461,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -6290,8 +6293,8 @@ switch(GetCommAttribute(attribute))
@@ -6262,8 +6265,8 @@ switch(GetCommAttribute(attribute))
{
if (strlen(copyhost)+strlen(VDOMAIN) < CF_MAXVARSIZE-2)
{
@ -485,7 +472,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -6324,6 +6327,7 @@ void PrependTidy(struct TidyPattern **li
@@ -6296,6 +6299,7 @@ void PrependTidy(struct TidyPattern **li
{ struct TidyPattern *tp;
char *spe = NULL,*sp, buffer[CF_EXPANDSIZE];
@ -493,7 +480,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ((tp = (struct TidyPattern *)malloc(sizeof(struct TidyPattern))) == NULL)
{
@@ -6353,10 +6357,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
@@ -6325,10 +6329,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
AddInstallable(tp->defines);
AddInstallable(tp->elsedef);
@ -511,7 +498,7 @@ $OpenBSD: patch-src_install_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
if (travlinks == '?')
@@ -6382,7 +6390,7 @@ tp->rmdirs =tidydirs;
@@ -6354,7 +6362,7 @@ tp->rmdirs =tidydirs;
if (classes != NULL)
{

24
sysutils/cfengine/patches/patch-src_item_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_item_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/item.c.orig Fri Aug 13 10:59:52 2004
+++ src/item.c Fri Oct 1 23:14:48 2004
@@ -212,6 +212,7 @@ void PrependItem (struct Item **liststar
{ struct Item *ip;
@ -48,7 +48,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ip->classes = spe;
}
else
@@ -303,6 +309,7 @@ void AppendItem (struct Item **liststart
@@ -302,6 +308,7 @@ void AppendItem (struct Item **liststart
{ struct Item *ip, *lp;
char *sp,*spe = NULL;
@ -56,7 +56,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (!PARSING && (ACTION == editfiles))
{
@@ -320,7 +327,8 @@ if ((ip = (struct Item *)malloc(sizeof(s
@@ -319,7 +326,8 @@ if ((ip = (struct Item *)malloc(sizeof(s
FatalError("");
}
@ -66,7 +66,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
{
CfLog(cferror,"","malloc");
FatalError("");
@@ -339,20 +347,24 @@ else
@@ -338,20 +346,24 @@ else
lp->next = ip;
}
@ -96,7 +96,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ip->classes = spe;
}
else
@@ -370,6 +382,7 @@ void InstallItem (struct Item **liststar
@@ -369,6 +381,7 @@ void InstallItem (struct Item **liststar
{ struct Item *ip, *lp;
char *sp,*spe = NULL;
@ -104,7 +104,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (!PARSING && (ACTION == editfiles))
{
@@ -388,7 +401,8 @@ if ((ip = (struct Item *)malloc(sizeof(s
@@ -387,7 +400,8 @@ if ((ip = (struct Item *)malloc(sizeof(s
FatalError("");
}
@ -114,7 +114,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
{
CfLog(cferror,"","malloc");
FatalError("");
@@ -407,13 +421,17 @@ else
@@ -406,13 +420,17 @@ else
lp->next = ip;
}
@ -136,7 +136,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (PIFELAPSED != -1)
{
@@ -438,7 +456,7 @@ ip->next = NULL;
@@ -437,7 +455,7 @@ ip->next = NULL;
if (classes != NULL)
{
@ -145,7 +145,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ip->classes = spe;
}
else
@@ -1061,7 +1079,7 @@ char *s1, *s2;
@@ -1059,7 +1077,7 @@ char *s1, *s2;
return 1;
}
sscanf(sp,"%ld",&cmp);
@ -154,7 +154,7 @@ $OpenBSD: patch-src_item_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if ( cmp < 0 )
{
@@ -1116,7 +1134,7 @@ struct Item *SplitStringAsItemList(char
@@ -1114,7 +1132,7 @@ struct Item *SplitStringAsItemList(char
Debug("SplitStringAsItemList(%s,%c)\n",string,sep);

12
sysutils/cfengine/patches/patch-src_macro_c
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-src_macro_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/macro.c.orig Mon Aug 2 20:52:24 2004
+++ src/macro.c Fri Oct 1 23:14:48 2004
@@ -175,6 +175,7 @@ void AddMacroValue(char *scope,char *nam
{ char *sp, buffer[CF_BUFSIZE],exp[CF_EXPANDSIZE];
struct cfObject *ptr;
int slot;
@ -9,7 +9,7 @@ $OpenBSD: patch-src_macro_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("AddMacroValue(%s.%s=%s)\n",scope,name,value);
@@ -151,13 +152,14 @@ ptr = ObjectContext(scope);
@@ -196,13 +197,14 @@ ptr = ObjectContext(scope);
snprintf(buffer,CF_BUFSIZE,"%s=%s",name,exp);
@ -26,7 +26,7 @@ $OpenBSD: patch-src_macro_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
slot = Hash(name);
@@ -273,7 +275,7 @@ if (strstr(name,"."))
@@ -319,7 +321,7 @@ if (strstr(name,"."))
if (ptr == NULL)
{

21
sysutils/cfengine/patches/patch-src_methods_c
View File

@ -1,7 +1,7 @@
$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';
$OpenBSD: patch-src_methods_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/methods.c.orig Tue Aug 17 20:11:28 2004
+++ src/methods.c Fri Oct 1 23:14:49 2004
@@ -272,24 +272,24 @@ options[0] = '\0';
if (INFORM)
{
@ -29,19 +29,10 @@ $OpenBSD: patch-src_methods_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
+(void)strlcat(options,"-Z ",sizeof(options));
+(void)strlcat(options,digeststring,sizeof(options));
+(void)strlcat(options," ",sizeof(options));
snprintf(execstr,CF_BUFSIZE-1,"%s/bin/cfagent -f %s %s",WORKDIR,GetMethodFilename(ptr),options);
@@ -706,7 +706,7 @@ while (!feof(fp))
case cfmeth_sendclass:
Debug("Defining class: %s\n",arg);
- strncpy(METHODRETURNCLASSES,arg,CF_BUFSIZE-1);
+ strlcpy(METHODRETURNCLASSES,arg,sizeof(METHODRETURNCLASSES));
break;
case cfmeth_attacharg:
@@ -1012,10 +1012,10 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -1062,10 +1062,10 @@ for (dirp = readdir(dirh); dirp != NULL;
SplitMethodName(dirp->d_name,client,server,name,digeststring,extra);
Debug("This request came from %s - our reply should be sent there!\n",client);

12
sysutils/cfengine/patches/patch-src_misc_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/misc.c.orig Fri Jul 30 15:06:17 2004
+++ src/misc.c Fri Oct 1 23:14:49 2004
@@ -556,17 +556,17 @@ char *ChecksumPrint(char type,unsigned c
switch(type)
@ -92,7 +92,7 @@ $OpenBSD: patch-src_misc_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(classbuf);
}
}
@@ -1152,19 +1152,19 @@ FILE *fp;
@@ -1175,19 +1175,19 @@ FILE *fp;
{
release += strlen(SUSE_RELEASE_FLAG);
sscanf(release, "%d.%d", &major, &minor);
@ -119,7 +119,7 @@ $OpenBSD: patch-src_misc_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
AddClassToHeap(classbuf);
}
@@ -1277,8 +1277,8 @@ char strminor[CF_MAXVARSIZE];
@@ -1300,8 +1300,8 @@ char strminor[CF_MAXVARSIZE];
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d.%d", &major, &minor) == 2)
{
@ -130,7 +130,7 @@ $OpenBSD: patch-src_misc_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -1290,15 +1290,15 @@ char strminor[CF_MAXVARSIZE];
@@ -1313,15 +1313,15 @@ char strminor[CF_MAXVARSIZE];
if (major != -1 && minor != -1 && vendor != "")
{
classbuf[0] = '\0';

12
sysutils/cfengine/patches/patch-src_modules_c
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-src_modules_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/modules.c.orig Mon Aug 16 18:52:40 2004
+++ src/modules.c Fri Oct 1 23:14:49 2004
@@ -73,7 +73,7 @@ else
}
AddSlash(ebuff);
@ -10,7 +10,7 @@ $OpenBSD: patch-src_modules_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (stat(ebuff,&statbuf) == -1)
{
@@ -86,7 +86,7 @@ if ((statbuf.st_uid != 0) && (statbuf.st
@@ -92,7 +92,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.2 2004/08/08 14:02:11 sturm Exp $
if (BufferOverflow(ebuff,args))
{
@@ -95,7 +95,7 @@ if (BufferOverflow(ebuff,args))
@@ -101,7 +101,7 @@ if (BufferOverflow(ebuff,args))
return false;
}

50
sysutils/cfengine/patches/patch-src_nameinfo_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/nameinfo.c.orig Tue Aug 17 08:54:14 2004
+++ src/nameinfo.c Fri Oct 1 23:14:49 2004
@@ -59,6 +59,7 @@ void GetNameInfo()
time_t tloc;
struct hostent *hp;
@ -54,27 +54,27 @@ $OpenBSD: patch-src_nameinfo_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
for (i=0; hp->h_aliases[i]!= NULL; i++)
{
@@ -382,7 +384,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
}
/* Old style compat */
- strcpy(ip,inet_ntoa(sin->sin_addr));
+ (void)strlcpy(ip,inet_ntoa(sin->sin_addr),sizeof(ip));
AppendItem(&IPADDRESSES,ip,"");
for (sp = ip+strlen(ip)-1; *sp != '.'; sp--)
@@ -393,8 +395,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
/* New style */
- strcpy(ip,"ipv4_");
- strcat(ip,inet_ntoa(sin->sin_addr));
+ (void)strlcpy(ip,"ipv4_",sizeof(ip));
+ (void)strlcat(ip,inet_ntoa(sin->sin_addr),sizeof(ip));
AddClassToHeap(CanonifyName(ip));
snprintf(name,CF_MAXVARSIZE-1,"ipv4[%s]",CanonifyName(ifp->ifr_name));
AddMacroValue(CONTEXTID,name,inet_ntoa(sin->sin_addr));
@@ -503,9 +505,9 @@ void AddNetworkClass(char *netmask) /* F
@@ -385,7 +387,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
}
/* Old style compat */
- strcpy(ip,inet_ntoa(sin->sin_addr));
+ (void)strlcpy(ip,inet_ntoa(sin->sin_addr),sizeof(ip));
AppendItem(&IPADDRESSES,ip,"");
for (sp = ip+strlen(ip)-1; *sp != '.'; sp--)
@@ -396,8 +398,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
/* New style */
- strcpy(ip,"ipv4_");
- strcat(ip,inet_ntoa(sin->sin_addr));
+ (void)strlcpy(ip,"ipv4_",sizeof(ip));
+ (void)strlcat(ip,inet_ntoa(sin->sin_addr),sizeof(ip));
AddClassToHeap(CanonifyName(ip));
snprintf(name,CF_MAXVARSIZE-1,"ipv4[%s]",CanonifyName(ifp->ifr_name));
AddMacroValue(CONTEXTID,name,inet_ntoa(sin->sin_addr));
@@ -505,9 +507,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.2 2004/08/08 14:02:11 sturm Exp $
while( (sp = strrchr(nmbuf,'.')) && strcmp(sp,".0") == 0 )
{
@@ -528,22 +530,22 @@ void SetDomainName(char *sp) /
@@ -530,22 +532,22 @@ void SetDomainName(char *sp) /
if (gethostname(fqn, sizeof(fqn)) != -1)
{

8
sysutils/cfengine/patches/patch-src_package_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_package_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/package.c.orig 2004-06-10 23:27:18.000000000 -0400
+++ src/package.c 2004-06-10 23:21:39.000000000 -0400
@@ -339,11 +339,11 @@ int DPKGPackageCheck(char *package,char
$OpenBSD: patch-src_package_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/package.c.orig Wed Aug 11 23:02:06 2004
+++ src/package.c Fri Oct 1 23:14:49 2004
@@ -338,11 +338,11 @@ int DPKGPackageCheck(char *package,char
treat "" as "no version" */
if (strncmp (evrstart, "(none)", strlen ("(none)")) == 0) {

54
sysutils/cfengine/patches/patch-src_parse_c
View File

@ -1,7 +1,7 @@
$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();
$OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/parse.c.orig Wed Aug 11 00:51:38 2004
+++ src/parse.c Fri Oct 1 23:14:49 2004
@@ -256,7 +256,7 @@ SetStrategies();
Debug1("\n\n==============================BEGIN NEW ACTION %s=============\n\n",ACTIONTEXT[action]);
ACTION = action;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
switch (ACTION)
{
@@ -271,7 +271,7 @@ switch (ACTION)
@@ -282,7 +282,7 @@ switch (ACTION)
}
Debug1("\nResetting CLASS to ANY\n\n");
@ -19,7 +19,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*******************************************************************/
@@ -287,7 +287,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
@@ -298,7 +298,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
if ((CONTROLVAR = ScanVariable(id)) != nonexistentvar)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return;
}
else
@@ -328,7 +328,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
@@ -339,7 +339,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
yyerror("Reserved class name (choose a different name)");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -347,14 +347,14 @@ Debug1("HandleBraceObjectID(%s) in actio
@@ -358,14 +358,14 @@ Debug1("HandleBraceObjectID(%s) in actio
switch (ACTION)
{
case acls:
@ -54,7 +54,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
InstallStrategy(id,CLASSBUFF);
}
else
@@ -366,7 +366,7 @@ switch (ACTION)
@@ -377,7 +377,7 @@ switch (ACTION)
case editfiles:
if (strlen(CURRENTOBJECT) == 0)
{
@ -63,7 +63,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
EDITGROUPLEVEL = 0;
FOREACHLEVEL = 0;
SEARCHREPLACELEVEL = 0;
@@ -380,7 +380,7 @@ switch (ACTION)
@@ -391,7 +391,7 @@ switch (ACTION)
case filters:
if (strlen(FILTERNAME)==0)
{
@ -72,7 +72,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
InstallFilter(id);
}
else
@@ -406,7 +406,7 @@ switch (ACTION)
@@ -417,7 +417,7 @@ switch (ACTION)
case filters:
case strategies:
@ -81,7 +81,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case editfiles:
@@ -420,7 +420,7 @@ switch (ACTION)
@@ -431,7 +431,7 @@ switch (ACTION)
HandleEdit(CURRENTOBJECT,id,NULL);
}
@ -90,7 +90,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
}
}
@@ -456,7 +456,7 @@ else
@@ -467,7 +467,7 @@ else
Debug1("Simple class = (%s)\n",id);
}
@ -99,7 +99,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/*******************************************************************/
@@ -473,13 +473,13 @@ switch (ACTION)
@@ -484,13 +484,13 @@ switch (ACTION)
break;
case filters:
@ -115,7 +115,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ACTIONPENDING = true;
InstallPending(ACTION);
break;
@@ -493,7 +493,7 @@ switch (ACTION)
@@ -504,7 +504,7 @@ switch (ACTION)
{
yyerror("Processes syntax error");
}
@ -124,7 +124,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
ACTIONPENDING = true;
InstallPending(ACTION);
@@ -517,7 +517,7 @@ switch (ACTION)
@@ -528,7 +528,7 @@ switch (ACTION)
yyerror("Missing process search expression");
}
Debug1("Installing expression %s\n",qstring);
@ -133,7 +133,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
HAVE_RESTART = false;
}
else if (HAVE_RESTART)
@@ -612,7 +612,7 @@ if (ACTION == methods)
@@ -633,7 +633,7 @@ if (ACTION == methods)
if (IsBuiltinFunction(fn))
{
local[0] = '\0';
@ -142,7 +142,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
switch (ACTION)
{
@@ -819,8 +819,8 @@ switch (ACTION)
@@ -840,8 +840,8 @@ switch (ACTION)
InstallPending(ACTION);
InitializeAction();
Debug1("\nFound SetOptionString\n");
@ -153,7 +153,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else if (HAVE_RESTART)
{
@@ -865,7 +865,7 @@ Debug("HandleServerRule(%s=%s)\n",object
@@ -886,7 +886,7 @@ Debug("HandleServerRule(%s=%s)\n",object
if (*buffer == '/')
{
Debug("\n\nNew admit/deny object=%s\n",buffer);
@ -162,7 +162,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -1005,7 +1005,7 @@ if ((yyin = fopen(filename,"r")) == NULL
@@ -1026,7 +1026,7 @@ if ((yyin = fopen(filename,"r")) == NULL
exit (1);
}
@ -171,7 +171,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("\n##########################################################################\n");
Debug("# BEGIN PARSING %s\n",VCURRENTFILE);
@@ -1086,7 +1086,7 @@ void RecordMacroId(char *name)
@@ -1107,7 +1107,7 @@ void RecordMacroId(char *name)
{
Debug("RecordMacroId(%s)\n",name);
@ -180,7 +180,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (strcmp(name,"this") == 0)
{
@@ -1116,7 +1116,7 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
@@ -1137,7 +1137,7 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
if (!IsAbsoluteFileName(filename)) /* Don't prepend to absolute names */
{
@ -189,7 +189,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (! IsAbsoluteFileName(result))
{
@@ -1131,13 +1131,13 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
@@ -1152,13 +1152,13 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
if (!IsAbsoluteFileName(filename)) /* Don't prepend to absolute names */
{
@ -206,7 +206,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
return result;
}
@@ -1161,8 +1161,8 @@ void InitializeAction()
@@ -1182,8 +1182,8 @@ void InitializeAction()
HAVE_RESTART = false;
VAGE = 99999;
strncpy(FINDERTYPE,"*",CF_BUFSIZE);
@ -217,8 +217,8 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
HAVE_RESTART = 0;
FILEACTION=warnall;
PIFELAPSED=-1;
@@ -1184,7 +1184,7 @@ void InitializeAction()
METHODREPLYTO[0] = '\0';
@@ -1204,7 +1204,7 @@ void InitializeAction()
PARSEMETHODRETURNCLASSES[0] = '\0';
METHODFORCE[0] = '\0';
CHROOT[0] = '\0';
- strcpy(VIFNAME,"");
@ -226,7 +226,7 @@ $OpenBSD: patch-src_parse_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
PTRAVLINKS = (short) '?';
IMAGEBACKUP = 'y';
ENCRYPT = 'n';
@@ -1226,7 +1226,7 @@ void InitializeAction()
@@ -1246,7 +1246,7 @@ void InitializeAction()
memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
memset(ELSECLASSBUFFER,0,CF_BUFSIZE);

84
sysutils/cfengine/patches/patch-src_varstring_c
View File

@ -1,7 +1,7 @@
$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++)
$OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/varstring.c.orig Wed Aug 11 23:07:05 2004
+++ src/varstring.c Fri Oct 1 23:14:50 2004
@@ -353,7 +353,7 @@ for (sp = string; /* No exit */ ; sp++)
FatalError("Can't expand varstring");
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -370,7 +370,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -367,7 +367,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -19,7 +19,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
continue;
}
sp++;
@@ -408,7 +408,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -405,7 +405,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -28,7 +28,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cffaculty:
@@ -422,7 +422,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -419,7 +419,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
@@ -433,7 +433,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -430,7 +430,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -46,7 +46,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -441,7 +441,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -438,7 +438,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -55,7 +55,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -450,7 +450,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -447,7 +447,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -64,7 +64,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfnetmask:
@@ -458,7 +458,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -455,7 +455,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -73,7 +73,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
@@ -467,7 +467,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -464,7 +464,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -82,7 +82,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfbinserver:
@@ -481,7 +481,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -478,7 +478,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -91,7 +91,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfsysadm:
@@ -494,7 +494,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -491,7 +491,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -100,7 +100,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfdomain:
@@ -507,7 +507,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -504,7 +504,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -109,7 +109,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfnfstype:
@@ -515,7 +515,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -512,7 +512,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -118,7 +118,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cftimezone:
@@ -528,7 +528,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -525,7 +525,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -127,7 +127,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfclass:
@@ -536,7 +536,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -533,7 +533,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -136,7 +136,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfarch:
@@ -544,7 +544,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -541,7 +541,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -145,7 +145,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfarch2:
@@ -552,7 +552,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -549,7 +549,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -154,7 +154,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
@@ -570,7 +570,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -567,7 +567,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -163,7 +163,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Chop(buffer);
}
@@ -583,7 +583,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -580,7 +580,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -172,7 +172,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -594,7 +594,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -591,7 +591,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -181,7 +181,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -605,7 +605,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -602,7 +602,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -190,7 +190,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
case cfhr:
@@ -615,7 +615,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -612,7 +612,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -199,7 +199,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -626,7 +626,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -623,7 +623,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -208,7 +208,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -634,14 +634,14 @@ for (sp = string; /* No exit */ ; sp++)
@@ -631,14 +631,14 @@ for (sp = string; /* No exit */ ; sp++)
if (strlen(ALLCLASSBUFFER) == 0)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
@ -225,7 +225,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfspc:
@@ -649,7 +649,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -646,7 +646,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -234,7 +234,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cftab:
@@ -657,7 +657,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -654,7 +654,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -243,7 +243,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cflf:
@@ -665,7 +665,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -662,7 +662,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -252,7 +252,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfcr:
@@ -673,7 +673,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -670,7 +670,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -261,7 +261,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfn:
@@ -681,7 +681,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -678,7 +678,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -270,7 +270,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfdblquote:
@@ -689,14 +689,14 @@ for (sp = string; /* No exit */ ; sp++)
@@ -686,14 +686,14 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -287,7 +287,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case cfdollar:
@@ -707,7 +707,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -704,7 +704,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -296,7 +296,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
else
{
@@ -715,7 +715,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -712,7 +712,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -305,7 +305,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
break;
@@ -748,7 +748,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -745,7 +745,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -314,7 +314,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("Expansion gave (%s)\n",buffer);
break;
@@ -764,7 +764,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -761,7 +761,7 @@ for (sp = string; /* No exit */ ; sp++)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
}
@ -323,7 +323,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
sp += strlen(currentitem);
@@ -798,7 +798,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -795,7 +795,7 @@ for (sp = string; /* No exit */ ; sp++)
sscanf(sp,"%[^$]",currentitem);
@ -332,7 +332,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -812,7 +812,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -809,7 +809,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -341,7 +341,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
continue;
}
sp++;
@@ -826,7 +826,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -823,7 +823,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -350,7 +350,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
sscanf(++sp,scanstr,currentitem); /* reduce item */
switch (ScanVariable(currentitem))
@@ -836,7 +836,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -833,7 +833,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -359,7 +359,7 @@ $OpenBSD: patch-src_varstring_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
}
@@ -897,7 +897,7 @@ if (!IsVarString(varstring))
@@ -894,7 +894,7 @@ if (!IsVarString(varstring))
return liststart;
}

4
sysutils/cfengine/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:39:32 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2004/10/01 21:22:15 sturm Exp $
@comment doc/
@comment doc/cfengine-2.1.7p1/
@comment doc/cfengine-${V}/
@info info/cfengine-Anomalies.info
@info info/cfengine-Reference.info
@info info/cfengine-Tutorial.info