fec479ae4c
problem but is not used anywhere and will probably be removed from cfengine from maintainer William Yodlowsky <bsd at openbsd.rutgers.edu>
54 lines
1.5 KiB
Plaintext
54 lines
1.5 KiB
Plaintext
$OpenBSD: patch-src_methods_c,v 1.5 2005/10/27 21:47:28 sturm Exp $
|
|
--- src/methods.c.orig Fri Sep 9 01:56:25 2005
|
|
+++ src/methods.c Fri Oct 21 16:35:56 2005
|
|
@@ -351,29 +351,29 @@ options[0] = '\0';
|
|
|
|
if (INFORM)
|
|
{
|
|
- strcat(options,"-I ");
|
|
+ (void)strlcat(options,"-I ",sizeof(options));
|
|
}
|
|
|
|
if (IGNORELOCK)
|
|
{
|
|
- strcat(options,"-K ");
|
|
+ (void)strlcat(options,"-K ",sizeof(options));
|
|
}
|
|
|
|
if (VERBOSE)
|
|
{
|
|
- strcat(options,"-v ");
|
|
+ (void)strlcat(options,"-v ",sizeof(options));
|
|
}
|
|
|
|
if (DEBUG || D2)
|
|
{
|
|
- strcat(options,"-d2 ");
|
|
+ (void)strlcat(options,"-d2 ",sizeof(options));
|
|
}
|
|
|
|
ptr = IsDefinedMethod(name,digeststring);
|
|
|
|
-strcat(options,"-Z ");
|
|
-strcat(options,digeststring);
|
|
-strcat(options," ");
|
|
+(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",CFWORKDIR,GetMethodFilename(ptr),options);
|
|
|
|
@@ -1145,10 +1145,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);
|
|
- 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)
|
|
{
|