*** cfengine-2.1.6/src/cfexecd.c	Sat Apr 17 10:11:14 2004
--- cfengine-2.1.6.MINPATCH/src/cfexecd.c	Mon Jun 14 14:17:55 2004
***************
*** 146,152 ****
  sprintf(VPREFIX, "cfexecd"); 
  openlog(VPREFIX,LOG_PID|LOG_NOWAIT|LOG_ODELAY,LOG_DAEMON);
  
! while ((c=getopt_long(argc,argv,"L:d:vhpFV1g",CFDOPTIONS,&optindex)) != EOF)
    {
    switch ((char) c)
        {
--- 146,153 ----
  sprintf(VPREFIX, "cfexecd"); 
  openlog(VPREFIX,LOG_PID|LOG_NOWAIT|LOG_ODELAY,LOG_DAEMON);
  
! while ((c=getopt_long(argc,argv,"L:d:f:vhpFV1g",CFDOPTIONS,&optindex)) != EOF)
! 
    {
    switch ((char) c)
        {
***************
*** 167,172 ****
--- 168,175 ----
                  printf("cfexecd Debug mode: running in foreground\n");
                  break;
  
+       case 'f': strncpy(VINPUTFILE,optarg,CF_BUFSIZE-1);
+ 
        case 'v': VERBOSE = true;
           break;
  
***************
*** 208,214 ****
  
  snprintf(VBUFF,CF_BUFSIZE,"%s/inputs/update.conf",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
! snprintf(VBUFF,CF_BUFSIZE,"%s/bin/cfagent",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
  snprintf(VBUFF,CF_BUFSIZE,"%s/outputs/spooled_reports",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
--- 211,217 ----
  
  snprintf(VBUFF,CF_BUFSIZE,"%s/inputs/update.conf",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
! snprintf(VBUFF,CF_BUFSIZE,"%s/sbin/cfagent",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
  snprintf(VBUFF,CF_BUFSIZE,"%s/outputs/spooled_reports",WORKDIR);
  MakeDirectoriesFor(VBUFF,'y');
***************
*** 382,388 ****
    char cfcom[CF_BUFSIZE];
    static char line[CF_BUFSIZE];
  
! snprintf(cfcom,CF_BUFSIZE-1,"%s/bin/cfagent -z",WORKDIR);
   
  if ((pp=cfpopen(cfcom,"r")) ==  NULL)
     {
--- 385,391 ----
    char cfcom[CF_BUFSIZE];
    static char line[CF_BUFSIZE];
  
! snprintf(cfcom,CF_BUFSIZE-1,"%s/sbin/cfagent -z",WORKDIR);
   
  if ((pp=cfpopen(cfcom,"r")) ==  NULL)
     {
***************
*** 565,575 ****
  
  if (NOSPLAY)
     {
!    snprintf(cmd,CF_BUFSIZE-1,"%s/bin/cfagent -q",WORKDIR);
     }
  else
     {
!    snprintf(cmd,CF_BUFSIZE-1,"%s/bin/cfagent",WORKDIR);
     }
   
  snprintf(line,100,CanonifyName(ctime(&starttime)));
--- 568,578 ----
  
  if (NOSPLAY)
     {
!    snprintf(cmd,CF_BUFSIZE-1,"%s/sbin/cfagent -qf %s",WORKDIR,VINPUTFILE);
     }
  else
     {
!    snprintf(cmd,CF_BUFSIZE-1,"%s/sbin/cfagent -f %s",WORKDIR,VINPUTFILE);
     }
   
  snprintf(line,100,CanonifyName(ctime(&starttime)));
*** cfengine-2.1.6/src/cfservd.c	Sat Apr 17 10:11:16 2004
--- cfengine-2.1.6.MINPATCH/src/cfservd.c	Mon Jun 14 14:13:39 2004
***************
*** 723,729 ****
    ptr = BINDINTERFACE;
    }
  
! if (getaddrinfo(ptr,"5308",&query,&response) != 0)
     {
     CfLog(cferror,"DNS/service lookup failure","getaddrinfo");
     return -1;   
--- 723,729 ----
    ptr = BINDINTERFACE;
    }
  
! if (getaddrinfo(ptr,"cfengine",&query,&response) != 0)
     {
     CfLog(cferror,"DNS/service lookup failure","getaddrinfo");
     return -1;   
***************
*** 1948,1954 ****
     int res = false;
     Debug("Examining rule in access list (%s,%s)?\n",realname,ap->path);
        
!    if ((strlen(realname) > strlen(ap->path))  && strncmp(ap->path,realname,strlen(ap->path)) == 0 && realname[strlen(ap->path)] == '/')
        {
        res = true;    /* Substring means must be a / to link, else just a substring og filename */
        }
--- 1948,1956 ----
     int res = false;
     Debug("Examining rule in access list (%s,%s)?\n",realname,ap->path);
        
!    if ((strlen(realname) > strlen(ap->path))  && strncmp(ap->path,realname,strlen(ap->path)) == 0 && 
!        (realname[strlen(ap->path)] == '/') || (strlen(ap->path) == 1) && strcmp(ap->path,"/" == 0))
! 
        {
        res = true;    /* Substring means must be a / to link, else just a substring og filename */
        }
*** cfengine-2.1.6/src/do.c	Sat Apr 17 10:10:55 2004
--- cfengine-2.1.6.MINPATCH/src/do.c	Mon Jun 14 14:08:17 2004
***************
*** 402,408 ****
        lp->done = 'y';
        }
  
!    snprintf(VBUFF,CF_BUFSIZE,"%.50s.%.50s",lp->from,lp->to); /* Unique ID for copy locking */
  
     if (!GetLock(ASUniqueName("link"),CanonifyName(VBUFF),lp->ifelapsed,lp->expireafter,VUQNAME,CFSTARTTIME))
        {
--- 402,408 ----
        lp->done = 'y';
        }
  
!    snprintf(VBUFF,CF_BUFSIZE,"%.100s.%.100s",lp->from,lp->to); /* Unique ID for copy locking */
  
     if (!GetLock(ASUniqueName("link"),CanonifyName(VBUFF),lp->ifelapsed,lp->expireafter,VUQNAME,CFSTARTTIME))
        {
***************
*** 513,519 ****
        lp->done = 'y';
        }
  
!    snprintf(VBUFF,CF_BUFSIZE,"%.50s.%.50s",lp->from,lp->to); /* Unique ID for copy locking */
     
     if (!GetLock(ASUniqueName("link"),CanonifyName(VBUFF),lp->ifelapsed,lp->expireafter,VUQNAME,CFSTARTTIME))
        {
--- 513,519 ----
        lp->done = 'y';
        }
  
!    snprintf(VBUFF,CF_BUFSIZE,"%.100s.%.100s",lp->from,lp->to); /* Unique ID for copy locking */
     
     if (!GetLock(ASUniqueName("link"),CanonifyName(VBUFF),lp->ifelapsed,lp->expireafter,VUQNAME,CFSTARTTIME))
        {
*** cfengine-2.1.6/src/ip.c	Sun May  2 05:09:01 2004
--- cfengine-2.1.6.MINPATCH/src/ip.c	Mon Jun 14 14:12:47 2004
***************
*** 53,59 ****
     query.ai_family = AF_UNSPEC;
     query.ai_socktype = SOCK_STREAM;
     
!    if ((err = getaddrinfo(host,"5308",&query,&response)) != 0)
        {
        snprintf(OUTPUT,CF_BUFSIZE,"Unable to lookup hostname or cfengine service: %s",gai_strerror(err));
        CfLog(cferror,OUTPUT,"");
--- 53,59 ----
     query.ai_family = AF_UNSPEC;
     query.ai_socktype = SOCK_STREAM;
     
!    if ((err = getaddrinfo(host,"cfengine",&query,&response)) != 0)
        {
        snprintf(OUTPUT,CF_BUFSIZE,"Unable to lookup hostname or cfengine service: %s",gai_strerror(err));
        CfLog(cferror,OUTPUT,"");
*** cfengine-2.1.6/src/locks.c	Sat Apr 17 10:11:08 2004
--- cfengine-2.1.6.MINPATCH/src/locks.c	Mon Jun 14 14:09:11 2004
***************
*** 201,208 ****
  memset(CFLAST,0,CF_BUFSIZE); 
   
  snprintf(CFLOG,CF_BUFSIZE,"%s/cfengine.%.40s.runlog",VLOGDIR,host);
! snprintf(CFLOCK,CF_BUFSIZE,"lock.%.100s.%.40s.%s.%.100s",VCANONICALFILE,host,operator,operand);
! snprintf(CFLAST,CF_BUFSIZE,"last.%s.100.%.40s.%s.%.100s",VCANONICALFILE,host,operator,operand);
   
  if (strlen(CFLOCK) > MAX_FILENAME)
     {
--- 201,209 ----
  memset(CFLAST,0,CF_BUFSIZE); 
   
  snprintf(CFLOG,CF_BUFSIZE,"%s/cfengine.%.40s.runlog",VLOGDIR,host);
! snprintf(CFLOCK,CF_BUFSIZE,"lock.%.200s.%.40s.%s.%.200s",VCANONICALFILE,host,operator,operand);
! snprintf(CFLAST,CF_BUFSIZE,"last.%.200s.%.40s.%s.%.200s",VCANONICALFILE,host,operator,operand);
! 
   
  if (strlen(CFLOCK) > MAX_FILENAME)
     {
*** cfengine-2.1.6/src/methods.c	Tue May  4 07:22:50 2004
--- cfengine-2.1.6.MINPATCH/src/methods.c	Mon Jun 14 14:15:35 2004
***************
*** 257,263 ****
  strcat(options,digeststring);
  strcat(options," ");
   
! snprintf(execstr,CF_BUFSIZE-1,"%s/bin/cfagent -f %s %s",WORKDIR,GetMethodFilename(ptr),options);
  
  Verbose("Trying %s\n",execstr);
   
--- 257,263 ----
  strcat(options,digeststring);
  strcat(options," ");
   
! snprintf(execstr,CF_BUFSIZE-1,"%s/sbin/cfagent -f %s %s",WORKDIR,GetMethodFilename(ptr),options);
  
  Verbose("Trying %s\n",execstr);