[gq-commit] gq/src configfile.c,1.22,1.23 configfile.h,1.13,1.14

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv22659

Modified Files:
	configfile.c configfile.h 
Log Message:
* Made a message string translateable by removing a #define and putting 
  its value directly into the code.


Index: configfile.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** configfile.c	18 Jun 2002 22:07:14 -0000	1.22
--- configfile.c	3 Jul 2002 18:49:45 -0000	1.23
***************
*** 607,611 ****
       /* refuse to read config file if world readable (bind passwords) */
       if( (sfile.st_mode & ~S_IFMT) != 00600 ) {
! 	  snprintf(errstr, sizeof(errstr), RCFILE_MODE_MSG, rcpath);
  	  error_push(load_context, errstr);
  	  error_flush(load_context);
--- 607,616 ----
       /* refuse to read config file if world readable (bind passwords) */
       if( (sfile.st_mode & ~S_IFMT) != 00600 ) {
! 	  snprintf(errstr, sizeof(errstr), 
! 		   _("%s is group and/or world readable.\n"
! 		     "This file can contain passwords in cleartext,\n"
! 		     "and should be mode 0600.\n\n"
! 		     "Continuing with default settings...\n"),
! 		   rcpath);
  	  error_push(load_context, errstr);
  	  error_flush(load_context);

Index: configfile.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configfile.h	5 Jun 2002 15:32:07 -0000	1.13
--- configfile.h	3 Jul 2002 18:49:45 -0000	1.14
***************
*** 36,44 ****
  #define RCFILE           ".gq"
  
- #define RCFILE_MODE_MSG "%s is world readable.\nThis file can contain " \
- 			"passwords,\n and should be mode 0600.\n\n" \
- 			"Continuing with default settings...\n"
- 
- 
  /* tokens for config file */
  #define T_UNKNOWN             0
--- 36,39 ----