[Serverfilters-commit] script filtercmd.c,1.12,1.13 filtercmd.h,1.3,1.4

[<ton...@us...>]

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

Modified Files:
	filtercmd.c filtercmd.h 
Log Message:
Cleanup some error codes

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** filtercmd.c	1 Mar 2004 06:24:08 -0000	1.12
--- filtercmd.c	1 Mar 2004 14:02:03 -0000	1.13
***************
*** 168,173 ****
   	if (err) return inerror(err);
  
! 	if((setgid(GID)) < 0) eperror("setgid");
! 	if((setuid(UID)) < 0) eperror("setuid");
  
  	err = checkcredentials(imap_server, user, passwd);
--- 168,173 ----
   	if (err) return inerror(err);
  
! 	if((setgid(GID)) < 0) eperror("setgid", ERR_NOT_SUID);
! 	if((setuid(UID)) < 0) eperror("setuid", ERR_NOT_SUID);
  
  	err = checkcredentials(imap_server, user, passwd);
***************
*** 218,223 ****
  }
  
! void eperror(s)
  register char *s;
  {
          /*
--- 218,224 ----
  }
  
! void eperror(s, exitcode)
  register char *s;
+ int exitcode;
  {
          /*
***************
*** 231,235 ****
     snprintf(str,STR_MAX,"filtercmd - %s",s);
     perror(str);
!    exit(1);
  }
  
--- 232,236 ----
     snprintf(str,STR_MAX,"filtercmd - %s",s);
     perror(str);
!    exit(exitcode);
  }
  

Index: filtercmd.h
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filtercmd.h	22 Feb 2004 21:18:01 -0000	1.3
--- filtercmd.h	1 Mar 2004 14:02:04 -0000	1.4
***************
*** 5,23 ****
  #define ERR_NO_CMD 2
  #define ERR_USAGE 3
! #define ERR_INVALID_COMMAND 4
! #define ERR_USER_IS_ROOT 5
! #define ERR_BAD_RC_PATH 6
! #define ERR_BAD_TEMP_PATH 7
! #define ERR_COPY_CANT_OPEN_SRC 8
! #define ERR_COPY_CANT_OPEN_DEST 9
! #define ERR_NEED_CREDENTIALS 10
! #define ERR_CANT_READ_IMAP_SERVER 11
! #define ERR_BAD_UID_GID 12
! #define ERR_BAD_CREDENTIALS 13
! #define ERR_BAD_LIBRARY 14
! #define ERR_CANT_FIND_VIRTUAL_DOMAIN 15
! #define ERR_CANT_TRUST_FILE 16
! #define ERR_BAD_RC_FILE_TYPE 17
! #define ERR_NO_RC_FILE_PATH 18
  
  static char *err_strings[] = {
--- 5,22 ----
  #define ERR_NO_CMD 2
  #define ERR_USAGE 3
! #define ERR_NOT_SUID 4
! #define ERR_INVALID_COMMAND 5
! #define ERR_USER_IS_ROOT 6
! #define ERR_COPY_CANT_OPEN_SRC 7
! #define ERR_COPY_CANT_OPEN_DEST 8
! #define ERR_NEED_CREDENTIALS 9
! #define ERR_CANT_READ_IMAP_SERVER 10
! #define ERR_BAD_UID_GID 11
! #define ERR_BAD_CREDENTIALS 12
! #define ERR_BAD_LIBRARY 13
! #define ERR_CANT_FIND_VIRTUAL_DOMAIN 14
! #define ERR_CANT_TRUST_FILE 15
! #define ERR_BAD_RC_FILE_TYPE 16
! #define ERR_NO_RC_FILE_PATH 17
  
  static char *err_strings[] = {
***************
*** 33,36 ****
--- 32,37 ----
  "Usage error - consult filtercmd.c\n",  
  
+ "Unable to setuid/setgid. Binary not setuid root?\n",
+ 
  "Invalid command specified.\n",
  
***************
*** 38,45 ****
  "The root user cannot be edited for security reasons\n",
  
- "rc file path fails checks\n",
- 
- "temp file path fails checks\n",
- 
  "Can't open source file\n",
  
--- 39,42 ----