*** 1.27r1/linuxconf/rules.mak	Fri Feb 22 21:53:59 2002
--- 1.27r3-pre/linuxconf/rules.mak	Sat Mar  2 21:13:46 2002
***************
*** 27,33 ****
  endif
  CC=gcc
  LINUXCONF_REV=1.27
! LINUXCONF_SUBREV=2
  LINUXCONF_SUBSUBREV=0
  # liblinuxconf revision
  LIB_REV=1
--- 27,33 ----
  endif
  CC=gcc
  LINUXCONF_REV=1.27
! LINUXCONF_SUBREV=3
  LINUXCONF_SUBSUBREV=0
  # liblinuxconf revision
  LIB_REV=1
***************
*** 345,349 ****
  
  pubspec_xml:
  	@mkdir -p /tmp/xml
! 	nacom -x *cc >/tmp/xml/$(CURDIR).xml
  
--- 345,349 ----
  
  pubspec_xml:
  	@mkdir -p /tmp/xml
! 	nacom -s$(CURDIR) -x *cc >/tmp/xml/$(CURDIR).xml
  
*** 1.27r1/linuxconf/help.files/sources/mailconf/basic-2.html	Thu Feb 21 15:00:11 2002
--- 1.27r3-pre/linuxconf/help.files/sources/mailconf/basic-2.html	Wed Mar 27 14:14:28 2002
***************
*** 48,54 ****
  
  <P>It is a way to reduce spam. Check out
  <A HREF="http://mail-abuse.org">http://mail-abuse.org</A> to learn about this feature. For every mail received, a special
! server is queried to accept or reject it.
  <P>
  <H2><A NAME="ss2.4">2.4 Anyone may run mailq</A>
  </H2>
--- 48,55 ----
  
  <P>It is a way to reduce spam. Check out
  <A HREF="http://mail-abuse.org">http://mail-abuse.org</A> to learn about this feature. For every mail received, a special
! server is queried to accept or reject it. Note that you need to
! subscribe to this service.
  <P>
  <H2><A NAME="ss2.4">2.4 Anyone may run mailq</A>
  </H2>
*** 1.27r1/linuxconf/help.files/sources/mailconf/basic.help	Thu Feb 21 15:00:09 2002
--- 1.27r3-pre/linuxconf/help.files/sources/mailconf/basic.help	Wed Mar 27 14:14:27 2002
***************
*** 119,131 ****
  
    It is a way to reduce spam. Check out http://mail-abuse.org to learn
    about this feature. For every mail received, a special server is
!   queried to accept or reject it.
  
  
    22..44..  AAnnyyoonnee mmaayy rruunn mmaaiillqq
  
    Anyone may view the current state of the mail queue.
- 
  
  
  
--- 119,131 ----
  
    It is a way to reduce spam. Check out http://mail-abuse.org to learn
    about this feature. For every mail received, a special server is
!   queried to accept or reject it. Note that you need to subscribe to
!   this service.
  
  
    22..44..  AAnnyyoonnee mmaayy rruunn mmaaiillqq
  
    Anyone may view the current state of the mail queue.
  
  
  
*** 1.27r1/linuxconf/help.files/sources/mailconf/basic.sgml	Thu Feb 21 14:59:58 2002
--- 1.27r3-pre/linuxconf/help.files/sources/mailconf/basic.sgml	Wed Mar 27 14:14:17 2002
***************
*** 122,128 ****
  		name="http://mail-abuse.org"
  		url="http://mail-abuse.org"
  	> to learn about this feature. For every mail received, a special
! 	server is queried to accept or reject it.
  
  <sect1>Anyone may run mailq
  <p>
--- 122,129 ----
  		name="http://mail-abuse.org"
  		url="http://mail-abuse.org"
  	> to learn about this feature. For every mail received, a special
! 	server is queried to accept or reject it. Note that you need to
! 	subscribe to this service.
  
  <sect1>Anyone may run mailq
  <p>
*** 1.27r1/linuxconf/messages/sources/userconf.dic	Fri May 11 15:30:50 2001
--- 1.27r3-pre/linuxconf/messages/sources/userconf.dic	Wed Mar 27 14:20:23 2002
***************
*** 549,555 ****
  !E_IVLDLOGINCHAR
      :E Invalid character in login name.\n
        +The following a illegal:\n
!       +    space , : ( ) [ ] ' \" | & ;
  !E_FAILCREATE
      :E Can't create user account
  !P_USERACCOUTS
--- 549,555 ----
  !E_IVLDLOGINCHAR
      :E Invalid character in login name.\n
        +The following a illegal:\n
!       +    space , : ( ) [ ] ' \" | & ; @
  !E_FAILCREATE
      :E Can't create user account
  !P_USERACCOUTS
*** 1.27r1/linuxconf/messages/sources/kernelconf.dic	Tue Nov 13 23:22:35 2001
--- 1.27r3-pre/linuxconf/messages/sources/kernelconf.dic	Wed Mar 27 13:22:08 2002
***************
*** 44,46 ****
--- 44,48 ----
      :E Module kernelconf was written by Gustavo Niemeyer (niemeyer@conectiva.com)
  !F_THREADSMAX
      :E Maximum processes
+ !P_USERKERNELCONF
+     :E control kernel settings
*** 1.27r1/linuxconf/misc/fviews.cc	Fri Dec 29 17:33:18 2000
--- 1.27r3-pre/linuxconf/misc/fviews.cc	Wed Mar 27 13:08:21 2002
***************
*** 647,654 ****
  
  /*
  	Update or add an assignement of the form var="val"
  */
! PUBLIC void VIEWITEMS::update (
  	const char *var,
  	const char *val)
  {
--- 647,656 ----
  
  /*
  	Update or add an assignement of the form var="val"
+ 	Return -1 if the update is rejected (variable name too long, by far).
+ 	Resulting lines are limited to 1000 characters.
  */
! PUBLIC int VIEWITEMS::update (
  	const char *var,
  	const char *val)
  {
***************
*** 687,704 ****
  		it->line.setfrom (line);
  		#
  	*/
! 	VIEWITEM *it = locateassign(var);
! 	if (it == NULL){
! 		it = new VIEWITEM("");
! 		add (it);
! 	}
  	char buf[1000];
  	if (vip.quotchar != 0){
! 	  snprintf (buf,sizeof(buf)-1,"%s%c%c%s%c",var,vip.sepchar,vip.quotchar,val,vip.quotchar);
  	}else{
! 	  snprintf (buf,sizeof(buf)-1,"%s%c%s",var,vip.sepchar,val);
  	}
! 	it->line.setfrom (buf);
  }
  
  /*
--- 689,714 ----
  		it->line.setfrom (line);
  		#
  	*/
! 	int ret = -1;
  	char buf[1000];
+ 	int len;
  	if (vip.quotchar != 0){
! 		len = snprintf (buf,sizeof(buf)-1,"%s%c%c%s%c",var,vip.sepchar,vip.quotchar,val,vip.quotchar);
! 	}else{
! 		len = snprintf (buf,sizeof(buf)-1,"%s%c%s",var,vip.sepchar,val);
! 	}
! 	if (len != -1 && len < (int)(sizeof(buf)-1)){
! 		VIEWITEM *it = locateassign(var);
! 		if (it == NULL){
! 			it = new VIEWITEM("");
! 			add (it);
! 		}
! 		it->line.setfrom (buf);
! 		ret = 0;
  	}else{
! 		fprintf (stderr,"VIEWITEMS::update rejected: %30.30s...\n",buf);
  	}
! 	return ret;
  }
  
  /*
*** 1.27r1/linuxconf/misc/fviews.h	Fri Dec 29 17:33:26 2000
--- 1.27r3-pre/linuxconf/misc/fviews.h	Wed Mar 27 13:08:04 2002
***************
*** 130,136 ****
  	void uncomment (VIEWITEM *vi);
  	bool uncomment (const char *var);
  	void update (const char *var, const SSTRING&val);
! 	void update (const char *var, const char *val);
  	void update (const char *var, int val);
  	void updatebval (const char *var, bool val);
  	void updatehval (const char *var, int val);
--- 130,136 ----
  	void uncomment (VIEWITEM *vi);
  	bool uncomment (const char *var);
  	void update (const char *var, const SSTRING&val);
! 	int update (const char *var, const char *val);
  	void update (const char *var, int val);
  	void updatebval (const char *var, bool val);
  	void updatehval (const char *var, int val);
*** 1.27r1/linuxconf/misc/misc.p	Wed Jan  2 16:10:40 2002
--- 1.27r3-pre/linuxconf/misc/misc.p	Wed Mar 27 13:08:04 2002
***************
*** 178,184 ****
  	 const char *mode);
  /* fopen.cc 22/12/1997 00.37.36 */
  FILE *xconf_fopen (const char *fname, const char *mode);
! /* fviews.cc 29/12/2000 17.33.18 */
  void fviews_required (void);
  /* helpf.cc 01/09/2000 00.19.10 */
  void help_setlang (const char *_lang, const char *envvar);
--- 178,184 ----
  	 const char *mode);
  /* fopen.cc 22/12/1997 00.37.36 */
  FILE *xconf_fopen (const char *fname, const char *mode);
! /* fviews.cc 27/03/2002 13.07.56 */
  void fviews_required (void);
  /* helpf.cc 01/09/2000 00.19.10 */
  void help_setlang (const char *_lang, const char *envvar);
***************
*** 313,324 ****
  void module_unsetone (const char *path);
  bool module_is_enabled (const char *path);
  int module_requestpkg (const char *logical_name);
! /* popen.cc 20/10/2001 00.19.12 */
  void popen_initsignal (void);
  int popen_getloginuid (void);
  /* samples.cc 06/04/2001 22.46.22 */
  /* sstream.cc 26/11/2000 22.48.04 */
! /* sstring.cc 02/01/2002 16.10.32 */
  /* sstrings.cc 06/09/2001 22.51.54 */
  /* str1.cc 12/11/1997 02.59.48 */
  int str_strip (const char *str, char *newstr);
--- 313,324 ----
  void module_unsetone (const char *path);
  bool module_is_enabled (const char *path);
  int module_requestpkg (const char *logical_name);
! /* popen.cc 01/02/2002 22.56.56 */
  void popen_initsignal (void);
  int popen_getloginuid (void);
  /* samples.cc 06/04/2001 22.46.22 */
  /* sstream.cc 26/11/2000 22.48.04 */
! /* sstring.cc 20/01/2002 23.11.12 */
  /* sstrings.cc 06/09/2001 22.51.54 */
  /* str1.cc 12/11/1997 02.59.48 */
  int str_strip (const char *str, char *newstr);
*** 1.27r1/linuxconf/misc/misc.pm	Wed Jan  2 16:10:40 2002
--- 1.27r3-pre/linuxconf/misc/misc.pm	Wed Mar 27 13:08:04 2002
***************
*** 283,289 ****
  PUBLIC FILE_CFG::FILE_CFG (FILE *_f, const CONFIG_FILE *_cf);
  /* fopen1.cc 30/07/1998 02.03.12 */
  /* fopen.cc 22/12/1997 00.37.36 */
! /* fviews.cc 29/12/2000 17.33.18 */
  PUBLIC VIEWITEMS_PARSER::VIEWITEMS_PARSER (void);
  PUBLIC VIRTUAL void VIEWITEMS_PARSER::init (VIEWITEMS&_vi);
  PUBLIC VIRTUAL bool VIEWITEMS_PARSER::is_comment (const char *line);
--- 283,289 ----
  PUBLIC FILE_CFG::FILE_CFG (FILE *_f, const CONFIG_FILE *_cf);
  /* fopen1.cc 30/07/1998 02.03.12 */
  /* fopen.cc 22/12/1997 00.37.36 */
! /* fviews.cc 27/03/2002 13.07.56 */
  PUBLIC VIEWITEMS_PARSER::VIEWITEMS_PARSER (void);
  PUBLIC VIRTUAL void VIEWITEMS_PARSER::init (VIEWITEMS&_vi);
  PUBLIC VIRTUAL bool VIEWITEMS_PARSER::is_comment (const char *line);
***************
*** 355,361 ****
  PUBLIC int VIEWITEMS::locatebval (const char *var);
  PUBLIC int VIEWITEMS::locatehval (const char *var);
  PUBLIC int VIEWITEMS::locatenval (const char *var);
! PUBLIC void VIEWITEMS::update (const char *var, const char *val);
  PUBLIC void VIEWITEMS::update (const char *var, const SSTRING&val);
  PUBLIC void VIEWITEMS::updatehval (const char *var, int val);
  PUBLIC void VIEWITEMS::update (const char *var, int val);
--- 355,361 ----
  PUBLIC int VIEWITEMS::locatebval (const char *var);
  PUBLIC int VIEWITEMS::locatehval (const char *var);
  PUBLIC int VIEWITEMS::locatenval (const char *var);
! PUBLIC int VIEWITEMS::update (const char *var, const char *val);
  PUBLIC void VIEWITEMS::update (const char *var, const SSTRING&val);
  PUBLIC void VIEWITEMS::updatehval (const char *var, int val);
  PUBLIC void VIEWITEMS::update (const char *var, int val);
***************
*** 457,463 ****
  	 bool force,
  	 bool enabled);
  PUBLIC void MODULE_INFOS::unsetone (const char *path);
! /* popen.cc 20/10/2001 00.19.12 */
  PROTECTED void POPENFD::setfds (int fdin,
  	 int fdout,
  	 int fderr,
--- 457,463 ----
  	 bool force,
  	 bool enabled);
  PUBLIC void MODULE_INFOS::unsetone (const char *path);
! /* popen.cc 01/02/2002 22.56.56 */
  PROTECTED void POPENFD::setfds (int fdin,
  	 int fdout,
  	 int fderr,
***************
*** 551,557 ****
  PUBLIC void SSTREAM_NUL::puts (const char *);
  PUBLIC char *SSTREAM_NUL::gets (char *, int);
  PUBLIC long SSTREAM_NUL::getoffset (void);
! /* sstring.cc 02/01/2002 16.10.32 */
  PUBLIC SSTRING::SSTRING (void);
  PUBLIC SSTRING::SSTRING (const char *_str);
  PUBLIC SSTRING::SSTRING (const char *_str, int _maxsiz);
--- 551,557 ----
  PUBLIC void SSTREAM_NUL::puts (const char *);
  PUBLIC char *SSTREAM_NUL::gets (char *, int);
  PUBLIC long SSTREAM_NUL::getoffset (void);
! /* sstring.cc 20/01/2002 23.11.12 */
  PUBLIC SSTRING::SSTRING (void);
  PUBLIC SSTRING::SSTRING (const char *_str);
  PUBLIC SSTRING::SSTRING (const char *_str, int _maxsiz);
*** 1.27r1/linuxconf/modules/stdmod.mak	Mon Feb  4 14:12:58 2002
--- 1.27r3-pre/linuxconf/modules/stdmod.mak	Thu Feb 28 22:21:32 2002
***************
*** 1,6 ****
  # Standard rules for building modules
  # CURDIR must be defined
! proto:
  	tlproto -ceo -f$(CURDIR).p -c+ -f$(CURDIR).pm -b$(CURDIR).h+$(CURDIR).pm $(PROTOUPDHEAD) \
  		`find . -maxdepth 1 -name \*.cc -o -name \*.tlcc`
  
--- 1,6 ----
  # Standard rules for building modules
  # CURDIR must be defined
! proto: $(LOCAL_PROTO)
  	tlproto -ceo -f$(CURDIR).p -c+ -f$(CURDIR).pm -b$(CURDIR).h+$(CURDIR).pm $(PROTOUPDHEAD) \
  		`find . -maxdepth 1 -name \*.cc -o -name \*.tlcc`
  
*** 1.27r1/linuxconf/modules/mailconf/conf/rulesets.rbl.cf	Wed Aug  2 11:09:08 2000
--- 1.27r3-pre/linuxconf/modules/mailconf/conf/rulesets.rbl.cf	Wed Mar 27 14:12:19 2002
***************
*** 1,10 ****
  # Support for RBL
! # See http://mail-abuse.org/rbl
  Scheck_rbl
  R$*					$: $(dequote "" $&{client_addr} $) $| $1
  R0 $| $*			$@ $1
  R127.0.0.1 $| $*	$@ $1
! R$-.$-.$-.$- $| $*	$: $(host $4.$3.$2.$1.rbl.maps.vix.com $: OK $) $| $5
  ROK $| $*			$@ $1
  R$+					$#error $@ 5.7.1 $: " Mail from " $(dequote "" $&{client_addr} $)" refused see http://mail-abuse.org/cgi-bin/lookup?"$&{client_addr}
  
--- 1,10 ----
  # Support for RBL
! # See http://blackholes.mail-abuse.org.
  Scheck_rbl
  R$*					$: $(dequote "" $&{client_addr} $) $| $1
  R0 $| $*			$@ $1
  R127.0.0.1 $| $*	$@ $1
! R$-.$-.$-.$- $| $*	$: $(host $4.$3.$2.$1.blackholes.mail-abuse.org $: OK $) $| $5
  ROK $| $*			$@ $1
  R$+					$#error $@ 5.7.1 $: " Mail from " $(dequote "" $&{client_addr} $)" refused see http://mail-abuse.org/cgi-bin/lookup?"$&{client_addr}
  
*** 1.27r1/linuxconf/modules/pppdialin/ppppostlogin	Fri Nov 24 00:01:47 2000
--- 1.27r3-pre/linuxconf/modules/pppdialin/ppppostlogin	Fri Mar 22 01:26:08 2002
***************
*** 1,12 ****
  #!/bin/sh
  # This script receives the arguments passed to /etc/ppp/ip-up by pppd
! # $6 is (not all the time "pppdialin userid")
  # $6 is passed by the pppd ipparam parameter when called by ppplogin
  PPPPARMS=/usr/lib/linuxconf/lib/pppparms
  read TOKEN USER <<-EOF
  	$6
  EOF
! if [ "$TOKEN" = "pppdialin" ] ; then
  	[ -z "$USER" ] || PEERNAME=$USER
  	# Check out the routing
  	$PPPPARMS routing $PEERNAME | \
--- 1,12 ----
  #!/bin/sh
  # This script receives the arguments passed to /etc/ppp/ip-up by pppd
! # $6 is (not all the time "linuxconf_dialin userid")
  # $6 is passed by the pppd ipparam parameter when called by ppplogin
  PPPPARMS=/usr/lib/linuxconf/lib/pppparms
  read TOKEN USER <<-EOF
  	$6
  EOF
! if [ "$TOKEN" = "pppdialin" -a "$TOKEN" = "linuxconf_dialin" ] ; then
  	[ -z "$USER" ] || PEERNAME=$USER
  	# Check out the routing
  	$PPPPARMS routing $PEERNAME | \
*** 1.27r1/linuxconf/modules/xterminals/review.tlcc	Fri Jan 18 16:48:15 2002
--- 1.27r3-pre/linuxconf/modules/xterminals/review.tlcc	Wed Mar 13 07:39:31 2002
***************
*** 33,38 ****
--- 33,39 ----
  static CONFIG_FILE f_access ("/etc/X11/xdm/Xaccess",help_xdm,CONFIGF_MANAGED);
  static CONFIG_FILE f_xdmconfig ("/etc/X11/xdm/xdm-config",help_xdm,CONFIGF_MANAGED);
  static CONFIG_FILE f_gdmconf ("/etc/X11/gdm/gdm.conf",help_xdm,CONFIGF_MANAGED);
+ static CONFIG_FILE f_kdmrc ("/etc/kde/kdm/kdmrc",help_xdm,CONFIGF_MANAGED|CONFIGF_OPTIONAL);
  static CONFIG_FILE f_xconfig ("/etc/X11/XF86Config",help_xdm
  	,CONFIGF_MANAGED|CONFIGF_OPTIONAL);
  static CONFIG_FILE f_xconfig4 ("/etc/X11/XF86Config-4",help_xdm
***************
*** 990,1028 ****
  	}
  	return ret;
  }
  /*
! 	Is it configured to support X terminals
  */
! static bool xdmconf_isok(const char *desktop, bool test)
  {
! 	bool ret = true;
! 	if (strcasecmp(desktop,"GNOME")==0){
! 		VIEWITEMS items;
! 		items.read (f_gdmconf);
! 		bool inxdmcp = false;
! 		// Make sure xdmcp is enable and at least 50 sessions available
! 		for (int i=0; i<items.getnb(); i++){
! 			VIEWITEM *it = items.getitem(i);
! 			const char *line = it->line.get();
! 			if (line[0] == '['){
! 				inxdmcp = strcmp(line,"[xdmcp]")==0;
! 			}else if (inxdmcp){
! 				if (stricmp(line,"Enable=0")==0){
! 					ret = false;
! 					it->line.setfrom ("Enable=1");
! 				}else if(stricmp(line,"Enable=false")==0){
  					ret = false;
! 					it->line.setfrom ("Enable=true");
! 				}else if (strncmp(line,"MaxSessions=",12)==0){
! 					int nb = atoi(line+12);
! 					if (nb < 50){
! 						ret = false;
! 						it->line.setfrom ("MaxSessions=50");
! 					}
  				}
  			}
  		}
! 		if (!ret && !test) items.write (f_gdmconf,NULL);
  	}else if (strcmp(desktop,"KDE")==0){
  		{
  			VIEWITEMS items;
--- 991,1039 ----
  	}
  	return ret;
  }
+ 
  /*
! 	Fix gdm.conf or kdmrc to enable xdmcp and other stuff
! 	Both files have the same layout (ini file).
  */
! static void xdmconf_isok (CONFIG_FILE &f_conf, bool test, bool &ret)
  {
! 	VIEWITEMS items;
! 	items.read (f_conf);
! 	bool inxdmcp = false;
! 	// Make sure xdmcp is enable and at least 50 sessions available
! 	for (int i=0; i<items.getnb(); i++){
! 		VIEWITEM *it = items.getitem(i);
! 		const char *line = it->line.get();
! 		if (line[0] == '['){
! 			inxdmcp = strcmp(line,"[xdmcp]")==0;
! 		}else if (inxdmcp){
! 			if (stricmp(line,"Enable=0")==0){
! 				ret = false;
! 				it->line.setfrom ("Enable=1");
! 			}else if(stricmp(line,"Enable=false")==0){
! 				ret = false;
! 				it->line.setfrom ("Enable=true");
! 			}else if (strncmp(line,"MaxSessions=",12)==0){
! 				int nb = atoi(line+12);
! 				if (nb < 50){
  					ret = false;
! 					it->line.setfrom ("MaxSessions=50");
  				}
  			}
  		}
! 	}
! 	if (!ret && !test) items.write (f_conf,NULL);
! }
! 
! /*
! 	Is it configured to support X terminals
! */
! static bool xdmconf_isok(const char *desktop, bool test)
! {
! 	bool ret = true;
! 	if (strcasecmp(desktop,"GNOME")==0){
! 		xdmconf_isok (f_gdmconf,test,ret);
  	}else if (strcmp(desktop,"KDE")==0){
  		{
  			VIEWITEMS items;
***************
*** 1062,1067 ****
--- 1073,1079 ----
  				}
  			}
  		}
+ 		xdmconf_isok (f_kdmrc,test,ret);
  	}
  	return ret;
  }
*** 1.27r1/linuxconf/modules/managerpm/mngrpm.cc	Sun Jan 20 23:15:59 2002
--- 1.27r3-pre/linuxconf/modules/managerpm/mngrpm.cc	Mon Feb 25 17:32:13 2002
***************
*** 274,280 ****
  					break;
  				}else{
  					if (mngrpm_domany (*this,MSG_U(T_DELPKGS,"Erase packages")
! 						,"-ev --percent",options,true)==0){
  						ret = 0;
  						break;
  					}
--- 274,280 ----
  					break;
  				}else{
  					if (mngrpm_domany (*this,MSG_U(T_DELPKGS,"Erase packages")
! 						,"-ev",options,true)==0){
  						ret = 0;
  						break;
  					}
*** 1.27r1/linuxconf/modules/kernelconf/kernelconf.cc	Tue Dec 12 16:47:37 2000
--- 1.27r3-pre/linuxconf/modules/kernelconf/kernelconf.cc	Wed Mar 27 14:44:36 2002
***************
*** 108,156 ****
  	}
  	if (strcmp(pt,"kernelconf")==0){
  		ret = -1;
! 		if (argc == 1){
! 			while (1){
! 				if (kernelconf_edit() == -1) break;
! 				if (netconf_checkupdate(true)!=2) break;
! 			}
! 		}else{
! 			for (int i = 1; i < argc; i++){
! 				if (i+2 < argc && strcmp(argv[i],"--set") == 0){
! 					SYSCTL sysctl;
! 					sysctl.set(argv[i+1],argv[i+2]);
! 					i+=2;
! 				}else if (i+2 < argc && strcmp(argv[i],"--settofile") == 0){
! 					SYSCTL sysctl;
! 					sysctl.set_to_file(argv[i+1],argv[i+2]);
! 					i+=2;
! 				}else if (i+2 < argc && strcmp(argv[i],"--settosys") == 0){
! 					SYSCTL sysctl;
! 					sysctl.set_to_sys(argv[i+1],argv[i+2]);
! 					i+=2;
! 				}else if (i+1 < argc && strcmp(argv[i],"--setdefault") == 0){
! 					SYSCTL sysctl;
! 					sysctl.erase(argv[i+1]);
! 					i++;
! 				}else if (i+1 < argc && strcmp(argv[i],"--getfromfile") == 0){
! 					SYSCTL sysctl;
! 					const char *val = sysctl.get_from_file(argv[i+1]);
! 					if (val == NULL){
! 						fprintf(stderr,MSG_U(E_NOTDEFINED,"Variable not defined!\n"));
  					}else{
! 						printf("%s\n",val);
  					}
- 					i++;
- 				}else if (i+1 < argc && strcmp(argv[i],"--getfromsys") == 0){
- 					SYSCTL sysctl;
- 					const char *val = sysctl.get_from_sys(argv[i+1]);
- 					if (val == NULL){
- 						fprintf(stderr,MSG_U(E_NOTFOUND,"Option not found!\n"));
- 					}else{
- 						printf("%s\n",val);
- 					}
- 					i++;
- 				}else{
- 					::usage();
  				}
  			}
  		}
--- 108,158 ----
  	}
  	if (strcmp(pt,"kernelconf")==0){
  		ret = -1;
! 		if (perm_rootaccess(MSG_U(P_USERKERNELCONF,"control kernel settings"))){
! 			if (argc == 1){
! 				while (1){
! 					if (kernelconf_edit() == -1) break;
! 					if (netconf_checkupdate(true)!=2) break;
! 				}
! 			}else{
! 				for (int i = 1; i < argc; i++){
! 					if (i+2 < argc && strcmp(argv[i],"--set") == 0){
! 						SYSCTL sysctl;
! 						sysctl.set(argv[i+1],argv[i+2]);
! 						i+=2;
! 					}else if (i+2 < argc && strcmp(argv[i],"--settofile") == 0){
! 						SYSCTL sysctl;
! 						sysctl.set_to_file(argv[i+1],argv[i+2]);
! 						i+=2;
! 					}else if (i+2 < argc && strcmp(argv[i],"--settosys") == 0){
! 						SYSCTL sysctl;
! 						sysctl.set_to_sys(argv[i+1],argv[i+2]);
! 						i+=2;
! 					}else if (i+1 < argc && strcmp(argv[i],"--setdefault") == 0){
! 						SYSCTL sysctl;
! 						sysctl.erase(argv[i+1]);
! 						i++;
! 					}else if (i+1 < argc && strcmp(argv[i],"--getfromfile") == 0){
! 						SYSCTL sysctl;
! 						const char *val = sysctl.get_from_file(argv[i+1]);
! 						if (val == NULL){
! 							fprintf(stderr,MSG_U(E_NOTDEFINED,"Variable not defined!\n"));
! 						}else{
! 							printf("%s\n",val);
! 						}
! 						i++;
! 					}else if (i+1 < argc && strcmp(argv[i],"--getfromsys") == 0){
! 						SYSCTL sysctl;
! 						const char *val = sysctl.get_from_sys(argv[i+1]);
! 						if (val == NULL){
! 							fprintf(stderr,MSG_U(E_NOTFOUND,"Option not found!\n"));
! 						}else{
! 							printf("%s\n",val);
! 						}
! 						i++;
  					}else{
! 						::usage();
  					}
  				}
  			}
  		}
*** 1.27r1/linuxconf/modules/kernelconf/kernelconf.m	Tue Nov 13 23:22:35 2001
--- 1.27r3-pre/linuxconf/modules/kernelconf/kernelconf.m	Wed Mar 27 13:22:08 2002
***************
*** 2,8 ****
  #ifndef DICTIONARY_REQUEST
  	#define DICTIONARY_REQUEST \
  	const char **_dictionary_kernelconf;\
! 	TRANSLATE_SYSTEM_REQ _dictionary_req_kernelconf("kernelconf",_dictionary_kernelconf,18,1);\
  	void dummy_dict_kernelconf(){}
  #endif
  #ifndef MSG_U
--- 2,8 ----
  #ifndef DICTIONARY_REQUEST
  	#define DICTIONARY_REQUEST \
  	const char **_dictionary_kernelconf;\
! 	TRANSLATE_SYSTEM_REQ _dictionary_req_kernelconf("kernelconf",_dictionary_kernelconf,19,1);\
  	void dummy_dict_kernelconf(){}
  #endif
  #ifndef MSG_U
***************
*** 31,33 ****
--- 31,34 ----
  #define F_SHMMAX	15
  #define A_ABOUT1	16
  #define F_THREADSMAX	17
+ #define P_USERKERNELCONF	18
*** 1.27r1/linuxconf/modules/kernelconf/sysctl.cc	Tue Oct 17 11:12:00 2000
--- 1.27r3-pre/linuxconf/modules/kernelconf/sysctl.cc	Wed Mar 27 13:22:27 2002
***************
*** 116,124 ****
  	char *pvar = this->dot_to_slash(var);
  	sprintf(buf,"/proc/sys/%s",pvar);
  	free(pvar);
! 	FILE *file = fopen(buf,"w");
  	if (file != NULL){
  		fprintf(file,"%s",val);
  	}
  }
  
--- 116,125 ----
  	char *pvar = this->dot_to_slash(var);
  	sprintf(buf,"/proc/sys/%s",pvar);
  	free(pvar);
! 	FILE *file = xconf_fopencfg(NULL,buf,"w");
  	if (file != NULL){
  		fprintf(file,"%s",val);
+ 		fclose (file);
  	}
  }
  
***************
*** 128,136 ****
  	char *pvar = this->dot_to_slash(var);
  	sprintf(buf,"/proc/sys/%s",pvar);
  	free(pvar);
! 	FILE *file = fopen(buf,"w");
  	if (file != NULL){
  		fprintf(file,"%d",val);
  	}
  }
  
--- 129,138 ----
  	char *pvar = this->dot_to_slash(var);
  	sprintf(buf,"/proc/sys/%s",pvar);
  	free(pvar);
! 	FILE *file = xconf_fopencfg(NULL,buf,"w");
  	if (file != NULL){
  		fprintf(file,"%d",val);
+ 		fclose (file);
  	}
  }
  
*** 1.27r1/linuxconf/rpmfiles/rpm.spec-files	Wed Feb 13 11:51:44 2002
--- 1.27r3-pre/linuxconf/rpmfiles/rpm.spec-files	Fri Mar  1 11:04:31 2002
***************
*** 45,52 ****
--- 45,55 ----
  /usr/bin/wineconf
  /usr/bin/fsbrowser
  /usr/lib/linuxconf/lib/shellmod-control
+ /usr/lib/linuxconf/lib/shellmod-lib.sh
+ /usr/lib/linuxconf/lib/shellmod-lib.pl
  /usr/bin/pidsocket
  /usr/bin/visualuntar
+ /usr/lib/linuxconf/help.eng/shellmod-msg*
  
  %files gui
  %defattr(-,root,root)
*** 1.27r1/linuxconf/userconf/user.cc	Mon Nov  5 10:18:10 2001
--- 1.27r3-pre/linuxconf/userconf/user.cc	Wed Mar 27 14:20:17 2002
***************
*** 607,613 ****
  		if (*pt < ' ') ret = -1;
  		pt++;
  	}
! 	const char *ivld = " :()[]\"'|&;,`*";
  	while (*ivld != '\0'){
  		if (strchr(name,*ivld)!=NULL){
  			ret = -1;
--- 607,613 ----
  		if (*pt < ' ') ret = -1;
  		pt++;
  	}
! 	const char *ivld = " :()[]\"'|&;,`*@";
  	while (*ivld != '\0'){
  		if (strchr(name,*ivld)!=NULL){
  			ret = -1;
***************
*** 618,624 ****
  		xconf_error (MSG_U(E_IVLDLOGINCHAR,
  			"Invalid character in login name.\n"
  			"The following a illegal:\n"
! 			"    space , : ( ) [ ] ' \" | & ;"));
  		field = 2;
  	}else{
  		comngs.set_str ("name",name);
--- 618,624 ----
  		xconf_error (MSG_U(E_IVLDLOGINCHAR,
  			"Invalid character in login name.\n"
  			"The following a illegal:\n"
! 			"    space , : ( ) [ ] ' \" | & ; @"));
  		field = 2;
  	}else{
  		comngs.set_str ("name",name);
*** 1.27r1/linuxconf/utils/tlccversion	Fri Feb 15 14:46:32 2002
--- 1.27r3-pre/linuxconf/utils/tlccversion	Tue Feb 26 11:36:18 2002
***************
*** 21,27 ****
  	while [ $# -gt 1 ]
  	do
  		if [ "$1" != "*.tlcc" ] ; then
! 			$CPP -dM $CPPOPTIONS $1 >>$TMPFILE
  		fi
  		shift
  	done
--- 21,27 ----
  	while [ $# -gt 1 ]
  	do
  		if [ "$1" != "*.tlcc" ] ; then
! 			$CPP -dM $CPPOPTIONS $1 >>$TMPFILE 2>/dev/null
  		fi
  		shift
  	done