[Serverfilters-commit] script filtercmd.c,1.7,1.8

[<jgs...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29719

Modified Files:
	filtercmd.c 
Log Message:
Fixed some of the "replace" functions.


Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** filtercmd.c	22 Feb 2004 21:18:01 -0000	1.7
--- filtercmd.c	23 Feb 2004 17:07:57 -0000	1.8
***************
*** 473,476 ****
--- 473,478 ----
  int findfilterfile(char *filter_type, char *filter_file, int buflen) {
  	int err;
+ 	char *tmp;
+ 	char *dom_user;
  
  	err = findfilterpath(filter_type, filter_file, buflen);
***************
*** 480,486 ****
  
  	/* TODO: these need to be replaced with global variable references */
! 	replace(filter_file, buflen, "[USERNAME]", real_user);   
  	replace(filter_file, buflen, "[DOMAIN]", domain ? domain : "");   
! 	replace(filter_file, buflen, "[DOMUSER]", user); 
  	
  	/* DEBUG */
--- 482,492 ----
  
  	/* TODO: these need to be replaced with global variable references */
! 	
! 	strcpy(dom_user, user);
! 	tmp = index(dom_user, '@');
! 	*tmp = '\0';
! 	replace(filter_file, buflen, "[USERNAME]",dom_user);   
  	replace(filter_file, buflen, "[DOMAIN]", domain ? domain : "");   
! 	replace(filter_file, buflen, "[DOMUSER]", real_user); 
  	
  	/* DEBUG */