[Mauiusers] A couple of patch suggestions for maui 3.2.6p16-snap.1157560841

[Josh Butikofer]

Ake,

These changes have been included in the Maui trunk and are also available in the most recent Maui 
snapshot:

http://www.clusterresources.com/downloads/maui/temp/maui-3.2.6p16-snap.1161376679.tar.gz

Thanks,

-- 
Joshua Butikofer
Cluster Resources, Inc.

josh at clusterresources.com
Voice: (801) 717-3707
Fax:   (801) 717-3738
--------------------------


Åke Sandgren wrote:
> Hi!
> Here are a couple of fixes that we have been running with a while that i
> seem to have forgotten to send.
> 
> They are all trivial.
> The OUserI buffer overflow hit us bad a couple of times.
> 
> 
> 
> ------------------------------------------------------------------------
> 
> diff -ru site/src/moab/MPBSI.c p1/src/moab/MPBSI.c
> --- site/src/moab/MPBSI.c	2006-09-21 12:45:30.000000000 +0200
> +++ p1/src/moab/MPBSI.c	2006-09-21 12:47:07.000000000 +0200
> @@ -768,7 +768,7 @@
>            if (MJobFind(SJID,&J,0) == SUCCESS)
>              {
>              if (IsExiting == TRUE)
> -              IsExiting |= (1 << mjfIsExiting);
> +              J->Flags |= (1 << mjfIsExiting);
>  
>              MRMJobPreUpdate(J);
>    
> @@ -781,7 +781,7 @@
>              /* if new job, load data */
>  
>              if (IsExiting == TRUE)
> -              IsExiting |= (1 << mjfIsExiting);
> +              J->Flags |= (1 << mjfIsExiting);
>  
>              MRMJobPreLoad(J,SJID,R->Index);
>  
> @@ -817,7 +817,7 @@
>            if (MJobFind(SJID,&J,0) == SUCCESS)
>              {
>              if (IsExiting == TRUE)
> -              IsExiting |= (1 << mjfIsExiting);
> +              J->Flags |= (1 << mjfIsExiting);
>  
>              /* if job never ran, remove record.  job cancelled externally */
>    
> 
> 
> ------------------------------------------------------------------------
> 
> diff -ru site/src/moab/MConfig.c p1/src/moab/MConfig.c
> --- site/src/moab/MConfig.c	2006-09-06 18:40:39.000000000 +0200
> +++ p1/src/moab/MConfig.c	2006-09-21 12:49:32.000000000 +0200
> @@ -1671,6 +1671,7 @@
>      case mcoJobFBAction:
>      case mcoMailAction:
>      case pAdminEAction:
> +    case pAdminEInterval:
>      case pCheckPointFile:
>      case pCheckPointInterval:
>      case pCheckPointExpirationTime:
> 
> 
> ------------------------------------------------------------------------
> 
> diff -ru site/src/server/OUserI.c p1/src/server/OUserI.c
> --- site/src/server/OUserI.c	2006-09-21 12:45:30.000000000 +0200
> +++ p1/src/server/OUserI.c	2006-09-21 12:52:51.000000000 +0200
> @@ -437,6 +437,7 @@
>          MCKeyword[mckArgs]);
>  
>        HeadSize = (int)strlen(SBuffer);
> +      S->SBufSize -= HeadSize + 1;
>  
>        if (Function[sindex] != NULL)
>          scode = (*Function[sindex])(args,S->SBuffer + HeadSize,FLAGS,Auth,&S->SBufSize);
> @@ -447,10 +448,7 @@
>  
>        *ptr = scode + '0';
>  
> -      if (S->SBufSize != sizeof(SBuffer))
> -        S->SBufSize += (long)HeadSize;
> -      else
> -        S->SBufSize = (long)strlen(S->SBuffer);
> +      S->SBufSize = (long)strlen(S->SBuffer);
>  
>        MSUSendData(S,MAX_SOCKETWAIT,TRUE,TRUE);
>  
> 
> 
> ------------------------------------------------------------------------
> 
> diff -ru site/src/server/Makefile p1/src/server/Makefile
> --- site/src/server/Makefile	2006-09-21 08:40:20.000000000 +0200
> +++ p1/src/server/Makefile	2006-09-21 12:54:21.000000000 +0200
> @@ -112,3 +112,5 @@
>  	rm $(INST_DIR)/bin/mprof
>  	rm $(INST_DIR)/sbin/maui
>  	rm $(INST_DIR)/include/moab.h
> +
> +UserI.o:	OUserI.c
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> mauiusers mailing list
> mauiusers at supercluster.org
> http://www.supercluster.org/mailman/listinfo/mauiusers