diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/cfr/main/introweb.html linuxconf-1.14r3.1/help.files/cfr/main/introweb.html
*** linuxconf-1.14r3/help.files/cfr/main/introweb.html Mon Mar 22 21:48:25 1999
--- linuxconf-1.14r3.1/help.files/cfr/main/introweb.html Wed Apr 7 14:08:54 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/fi/main/introweb.html linuxconf-1.14r3.1/help.files/fi/main/introweb.html
*** linuxconf-1.14r3/help.files/fi/main/introweb.html Mon Mar 22 21:48:34 1999
--- linuxconf-1.14r3.1/help.files/fi/main/introweb.html Wed Apr 7 14:09:09 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/fr/main/introweb.html linuxconf-1.14r3.1/help.files/fr/main/introweb.html
*** linuxconf-1.14r3/help.files/fr/main/introweb.html Mon Mar 22 21:48:43 1999
--- linuxconf-1.14r3.1/help.files/fr/main/introweb.html Wed Apr 7 14:09:21 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/it/main/introweb.html linuxconf-1.14r3.1/help.files/it/main/introweb.html
*** linuxconf-1.14r3/help.files/it/main/introweb.html Mon Mar 22 21:49:04 1999
--- linuxconf-1.14r3.1/help.files/it/main/introweb.html Wed Apr 7 14:09:43 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/no/main/introweb.html linuxconf-1.14r3.1/help.files/no/main/introweb.html
*** linuxconf-1.14r3/help.files/no/main/introweb.html Mon Mar 22 21:49:09 1999
--- linuxconf-1.14r3.1/help.files/no/main/introweb.html Wed Apr 7 14:09:49 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/pt/main/introweb.html linuxconf-1.14r3.1/help.files/pt/main/introweb.html
*** linuxconf-1.14r3/help.files/pt/main/introweb.html Mon Mar 22 21:49:17 1999
--- linuxconf-1.14r3.1/help.files/pt/main/introweb.html Wed Apr 7 14:10:01 1999
***************
*** 1,8 ****
! Configurador Linux 1.14r1.2
! Configurador Linux 1.14r1.2
--- 1,8 ----
! Configurador Linux 1.14r3.1
! Configurador Linux 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/se/main/introweb.html linuxconf-1.14r3.1/help.files/se/main/introweb.html
*** linuxconf-1.14r3/help.files/se/main/introweb.html Mon Mar 22 21:49:41 1999
--- linuxconf-1.14r3.1/help.files/se/main/introweb.html Wed Apr 7 14:10:27 1999
***************
*** 1,8 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 1,8 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/help.files/sk/main/introweb.html linuxconf-1.14r3.1/help.files/sk/main/introweb.html
*** linuxconf-1.14r3/help.files/sk/main/introweb.html Mon Mar 22 21:49:52 1999
--- linuxconf-1.14r3.1/help.files/sk/main/introweb.html Wed Apr 7 14:10:42 1999
***************
*** 2,9 ****
! Linuxconf 1.14r1.2
! Linuxconf 1.14r1.2
--- 2,9 ----
! Linuxconf 1.14r3.1
! Linuxconf 1.14r3.1
Only in linuxconf-1.14r3/help.files/sources/main: introweb.html
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/messages/sources/dnsconf.dic linuxconf-1.14r3.1/messages/sources/dnsconf.dic
*** linuxconf-1.14r3/messages/sources/dnsconf.dic Wed Apr 7 02:19:01 1999
--- linuxconf-1.14r3.1/messages/sources/dnsconf.dic Wed Apr 7 12:48:25 1999
***************
*** 372,373 ****
--- 372,379 ----
!F_NOTIFY
:E Notify
+ !I_NO
+ :E No
+ !I_YES
+ :E Yes
+ !I_DEFAULT
+ :E Default
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/misc/misc.p linuxconf-1.14r3.1/misc/misc.p
*** linuxconf-1.14r3/misc/misc.p Mon Mar 29 11:18:15 1999
--- linuxconf-1.14r3.1/misc/misc.p Wed Apr 7 19:43:54 1999
***************
*** 106,110 ****
void help_setlang (const char *_lang, const char *envvar);
void helpf_checkall (void);
! /* ipnum.cc 29/03/99 11.18.04 */
void ipnum_ip2a (struct hostent *ent, char *buf);
void ipnum_ip2a (struct hostent *ent, SSTRING&ip);
--- 106,110 ----
void help_setlang (const char *_lang, const char *envvar);
void helpf_checkall (void);
! /* ipnum.cc 29/03/99 11.20.54 */
void ipnum_ip2a (struct hostent *ent, char *buf);
void ipnum_ip2a (struct hostent *ent, SSTRING&ip);
***************
*** 116,120 ****
bool ipnum_validip (const char *aip, bool ishost);
bool ipnum_validip (const char *aip, const char *netmask, bool ishost);
! /* ipstuff.cc 31/07/97 00.29.50 */
/* linuxconf.cc 26/10/98 18.36.18 */
void linuxconf_sethook (CONFDB * (*fct)(CONFDB *));
--- 116,120 ----
bool ipnum_validip (const char *aip, bool ishost);
bool ipnum_validip (const char *aip, const char *netmask, bool ishost);
! /* ipstuff.cc 07/04/99 02.43.14 */
/* linuxconf.cc 26/10/98 18.36.18 */
void linuxconf_sethook (CONFDB * (*fct)(CONFDB *));
***************
*** 217,221 ****
int popen_getloginuid (void);
/* sstream.cc 08/12/98 01.32.18 */
! /* sstring.cc 29/03/99 09.12.46 */
/* sstrings.cc 11/09/98 17.11.26 */
/* str.cc 28/07/98 14.20.02 */
--- 217,221 ----
int popen_getloginuid (void);
/* sstream.cc 08/12/98 01.32.18 */
! /* sstring.cc 07/04/99 19.43.42 */
/* sstrings.cc 11/09/98 17.11.26 */
/* str.cc 28/07/98 14.20.02 */
***************
*** 267,271 ****
int subsys_diff (int nb, const char *tb[]);
int subsys_history (int nb, const char *tb[]);
! /* timestr.cc 06/01/98 03.02.00 */
/* uname.cc 05/02/99 00.45.54 */
int kernel_version (int v[3]);
--- 267,271 ----
int subsys_diff (int nb, const char *tb[]);
int subsys_history (int nb, const char *tb[]);
! /* timestr.cc 07/04/99 02.42.44 */
/* uname.cc 05/02/99 00.45.54 */
int kernel_version (int v[3]);
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/misc/misc.pm linuxconf-1.14r3.1/misc/misc.pm
*** linuxconf-1.14r3/misc/misc.pm Mon Mar 29 11:18:15 1999
--- linuxconf-1.14r3.1/misc/misc.pm Wed Apr 7 19:43:54 1999
***************
*** 243,248 ****
PUBLIC const char *HELP_FILE::getpath (void);
PUBLIC void HELP_FILE::getrpath (char *rpath);
! /* ipnum.cc 29/03/99 11.18.04 */
! /* ipstuff.cc 31/07/97 00.29.50 */
PUBLIC IP_ADDR::IP_ADDR (void);
PUBLIC IP_ADDR::IP_ADDR (const SSTRING&str);
--- 243,248 ----
PUBLIC const char *HELP_FILE::getpath (void);
PUBLIC void HELP_FILE::getrpath (char *rpath);
! /* ipnum.cc 29/03/99 11.20.54 */
! /* ipstuff.cc 07/04/99 02.43.14 */
PUBLIC IP_ADDR::IP_ADDR (void);
PUBLIC IP_ADDR::IP_ADDR (const SSTRING&str);
***************
*** 379,383 ****
PUBLIC void SSTREAM_NUL::puts (const char *);
PUBLIC char *SSTREAM_NUL::gets (char *, int);
! /* sstring.cc 29/03/99 09.12.46 */
PUBLIC SSTRING::SSTRING (void);
PUBLIC SSTRING::SSTRING (const char *_str);
--- 379,383 ----
PUBLIC void SSTREAM_NUL::puts (const char *);
PUBLIC char *SSTREAM_NUL::gets (char *, int);
! /* sstring.cc 07/04/99 19.43.42 */
PUBLIC SSTRING::SSTRING (void);
PUBLIC SSTRING::SSTRING (const char *_str);
***************
*** 411,416 ****
PUBLIC bool SSTRING::truncate (int newlen);
PUBLIC void CSSTRING::setcomment (const SSTRING&com);
! PUBLIC int SSTRING::sprintf (const char *ctl, ...);
! PUBLIC int SSTRING::append_sprintf (const char *ctl, ...);
/* sstrings.cc 11/09/98 17.11.26 */
PUBLIC SSTRING *SSTRINGS::getitem (int no)const;
--- 411,416 ----
PUBLIC bool SSTRING::truncate (int newlen);
PUBLIC void CSSTRING::setcomment (const SSTRING&com);
! PUBLIC int SSTRING::setfromf (const char *ctl, ...);
! PUBLIC int SSTRING::appendf (const char *ctl, ...);
/* sstrings.cc 11/09/98 17.11.26 */
PUBLIC SSTRING *SSTRINGS::getitem (int no)const;
***************
*** 439,443 ****
PUBLIC void ONECONF::remove (void);
PUBLIC const char *ONECONF::getfamily (const char *subsys);
! /* timestr.cc 06/01/98 03.02.00 */
PRIVATE void TIMESTR::formatstr (void);
PUBLIC void TIMESTR::setfrom (const char *_str);
--- 439,443 ----
PUBLIC void ONECONF::remove (void);
PUBLIC const char *ONECONF::getfamily (const char *subsys);
! /* timestr.cc 07/04/99 02.42.44 */
PRIVATE void TIMESTR::formatstr (void);
PUBLIC void TIMESTR::setfrom (const char *_str);
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/misc/sstring.cc linuxconf-1.14r3.1/misc/sstring.cc
*** linuxconf-1.14r3/misc/sstring.cc Mon Mar 29 09:12:46 1999
--- linuxconf-1.14r3.1/misc/sstring.cc Wed Apr 7 19:43:43 1999
***************
*** 258,262 ****
Return the number of bytes stored
*/
! PUBLIC int SSTRING::sprintf (const char *ctl, ...)
{
va_list list;
--- 258,262 ----
Return the number of bytes stored
*/
! PUBLIC int SSTRING::setfromf (const char *ctl, ...)
{
va_list list;
***************
*** 273,277 ****
Return the number of bytes stored
*/
! PUBLIC int SSTRING::append_sprintf (const char *ctl, ...)
{
va_list list;
--- 273,277 ----
Return the number of bytes stored
*/
! PUBLIC int SSTRING::appendf (const char *ctl, ...)
{
va_list list;
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/misc/sstring.h linuxconf-1.14r3.1/misc/sstring.h
*** linuxconf-1.14r3/misc/sstring.h Sun Mar 28 17:39:08 1999
--- linuxconf-1.14r3.1/misc/sstring.h Wed Apr 7 19:43:54 1999
***************
*** 15,19 ****
SSTRING (void);
void append (const char *app);
! int append_sprintf (const char *ctl, ...);
int cmp (const SSTRING&other)const;
int cmp (const char *other)const;
--- 15,19 ----
SSTRING (void);
void append (const char *app);
! int appendf (const char *ctl, ...);
int cmp (const SSTRING&other)const;
int cmp (const char *other)const;
***************
*** 34,39 ****
virtual void setfrom (const char *src);
void setfrom (int val);
void setmaxsiz (int size);
- int sprintf (const char *ctl, ...);
const char *strchr (char carac)const;
void strip_end (void);
--- 34,39 ----
virtual void setfrom (const char *src);
void setfrom (int val);
+ int setfromf (const char *ctl, ...);
void setmaxsiz (int size);
const char *strchr (char carac)const;
void strip_end (void);
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/modules/dnsconf/dnsconf.m linuxconf-1.14r3.1/modules/dnsconf/dnsconf.m
*** linuxconf-1.14r3/modules/dnsconf/dnsconf.m Wed Apr 7 02:19:01 1999
--- linuxconf-1.14r3.1/modules/dnsconf/dnsconf.m Wed Apr 7 12:48:25 1999
***************
*** 3,7 ****
#define DICTIONARY_REQUEST \
const char **_dictionary_dnsconf;\
! TRANSLATE_SYSTEM_REQ _dictionary_req_dnsconf("dnsconf",_dictionary_dnsconf,158,15);\
void dummy_dict_dnsconf(){}
#endif
--- 3,7 ----
#define DICTIONARY_REQUEST \
const char **_dictionary_dnsconf;\
! TRANSLATE_SYSTEM_REQ _dictionary_req_dnsconf("dnsconf",_dictionary_dnsconf,161,15);\
void dummy_dict_dnsconf(){}
#endif
***************
*** 172,173 ****
--- 172,176 ----
#define F_ACLNAME 156
#define F_NOTIFY 157
+ #define I_NO 158
+ #define I_YES 159
+ #define I_DEFAULT 160
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/modules/dnsconf/primary.cc linuxconf-1.14r3.1/modules/dnsconf/primary.cc
*** linuxconf-1.14r3/modules/dnsconf/primary.cc Wed Apr 7 02:18:54 1999
--- linuxconf-1.14r3.1/modules/dnsconf/primary.cc Wed Apr 7 12:48:08 1999
***************
*** 405,408 ****
--- 405,417 ----
feature_editlist (dia,level2,MSG_R(F_ALLOWQUERY),allowquery);
feature_editlist (dia,level2,MSG_U(F_ALLOWUPDATE,"Allow update from"),allowupdate);
+ {
+ static const char *tbmode[]={
+ MSG_U(I_NO,"No"),
+ MSG_U(I_YES,"Yes"),
+ MSG_U(I_DEFAULT,"Default"),
+ NULL
+ };
+ dia.newf_chkm (MSG_R(F_NOTIFY),notify,tbmode);
+ }
feature_editlist (dia,level2,MSG_U(F_ALSONOTIFY,"Also notify"),alsonotify);
}
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/modules/firewall/ipfwrule.cc linuxconf-1.14r3.1/modules/firewall/ipfwrule.cc
*** linuxconf-1.14r3/modules/firewall/ipfwrule.cc Wed Mar 3 22:28:10 1999
--- linuxconf-1.14r3.1/modules/firewall/ipfwrule.cc Wed Apr 7 12:50:14 1999
***************
*** 349,353 ****
int ret = redir2 - redir1;
if (ret == 0){
! int ret = masq1 - masq2;
if (ret == 0){
ret = netmask1 - netmask2;
--- 349,353 ----
int ret = redir2 - redir1;
if (ret == 0){
! ret = masq1 - masq2;
if (ret == 0){
ret = netmask1 - netmask2;
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/netconf/ipalias.cc linuxconf-1.14r3.1/netconf/ipalias.cc
*** linuxconf-1.14r3/netconf/ipalias.cc Fri Feb 5 11:13:42 1999
--- linuxconf-1.14r3.1/netconf/ipalias.cc Wed Apr 7 22:56:23 1999
***************
*** 56,60 ****
char cmd[100],devali[20];
sprintf (devali,"%s:%d",devname,num);
! sprintf (cmd,"%s- 0.0.0.0",devali);
net_printhint ("del %s\n",devali);
return netconf_system_if ("ifconfig",cmd);
--- 56,64 ----
char cmd[100],devali[20];
sprintf (devali,"%s:%d",devname,num);
! if (kernel_newer (2,2,0)){
! sprintf (cmd,"%s 0.0.0.0",devali);
! }else{
! sprintf (cmd,"%s- 0.0.0.0",devali);
! }
net_printhint ("del %s\n",devali);
return netconf_system_if ("ifconfig",cmd);
***************
*** 153,156 ****
--- 157,175 ----
}
fclose (fin);
+ }else{
+ // I don't know how to find out how many aliases exists
+ // so I scan until I get 50 consecutive failures. Weird
+ int nbfail = 0;
+ for (int i=0; i<100000 && nbfail < 50; i++,nbfail++){
+ IFCONFIG_INFO info;
+ char devali[20];
+ snprintf (devali,sizeof(devali)-1,"%s:%d",devname,i);
+ if (ifconfig_getinfo_nocheck(devali,info)!=-1){
+ if (info.ip_addr[0] != '\0'){
+ add (new IP_ALIAS(i,info.ip_addr,info.netmask));
+ nbfail=0;
+ }
+ }
+ }
}
}
***************
*** 343,351 ****
PUBLIC int IP_ALIASES::setup (const char *devname)
{
! int max_kernel_aliases = 256;
! FILE *fin = f_max_aliases.fopen ("r");
! if (fin != NULL){
! fscanf (fin,"%d\n",&max_kernel_aliases);
! fclose (fin);
}
IP_ALIASES proc;
--- 362,378 ----
PUBLIC int IP_ALIASES::setup (const char *devname)
{
! int max_kernel_aliases = 10000000;
! /* #Specification: IP aliases / maximum / kernel 2.2
! On kernel older than 2.2, linuxconf checks the maximum
! number of aliases and reconfigure the kernel accordingly.
! On Linux 2.2, there is no limit. Nothing to do for linuxconf.
! */
! if (!kernel_newer (2,2,0)){
! max_kernel_aliases = 256;
! FILE *fin = f_max_aliases.fopen ("r");
! if (fin != NULL){
! fscanf (fin,"%d\n",&max_kernel_aliases);
! fclose (fin);
! }
}
IP_ALIASES proc;
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/netconf/routes.cc linuxconf-1.14r3.1/netconf/routes.cc
*** linuxconf-1.14r3/netconf/routes.cc Fri Mar 19 23:53:31 1999
--- linuxconf-1.14r3.1/netconf/routes.cc Wed Apr 7 23:49:58 1999
***************
*** 343,347 ****
,buf);
ret = -1;
! }else{
ip_dst = ntohl(ip_dst);
ip_gate = ntohl(ip_gate);
--- 343,347 ----
,buf);
ret = -1;
! }else if (flags & 1){ // Only collect routes which are UP
ip_dst = ntohl(ip_dst);
ip_gate = ntohl(ip_gate);
***************
*** 357,365 ****
flagstr[0] = '\0';
if (flags & 1) strcat (flagstr,"U");
! if ((flags & (4+2))!=0){
iface[0] = '\0';
! if (flags & 2) strcat (flagstr,"G");
! if (flags & 4) strcat (flagstr,"H");
}
ROUTE *rt = new ROUTE (ip_dst_str,ip_gate_str,gen_mask_str
,flagstr,iface);
--- 357,365 ----
flagstr[0] = '\0';
if (flags & 1) strcat (flagstr,"U");
! if (flags & 2){
iface[0] = '\0';
! strcat (flagstr,"G");
}
+ if (flags & 4) strcat (flagstr,"H");
ROUTE *rt = new ROUTE (ip_dst_str,ip_gate_str,gen_mask_str
,flagstr,iface);
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/rules.mak linuxconf-1.14r3.1/rules.mak
*** linuxconf-1.14r3/rules.mak Wed Apr 7 01:44:35 1999
--- linuxconf-1.14r3.1/rules.mak Wed Apr 7 12:50:31 1999
***************
*** 12,16 ****
LINUXCONF_REV=1.14
LINUXCONF_SUBREV=3
! LINUXCONF_SUBSUBREV=0
ifeq ($(LINUXCONF_SUBSUBREV),0)
ifeq ($(LINUXCONF_SUBREV),0)
--- 12,16 ----
LINUXCONF_REV=1.14
LINUXCONF_SUBREV=3
! LINUXCONF_SUBSUBREV=1
ifeq ($(LINUXCONF_SUBSUBREV),0)
ifeq ($(LINUXCONF_SUBREV),0)
diff -rc2P -x *.o -x *.a -x *.bak -x *~ -x *.help -x *.old -x *.nap -x *.nar -x *.nas -x *.gif -x *.class linuxconf-1.14r3/userconf/user.cc linuxconf-1.14r3.1/userconf/user.cc
*** linuxconf-1.14r3/userconf/user.cc Mon Mar 29 10:17:59 1999
--- linuxconf-1.14r3.1/userconf/user.cc Wed Apr 7 20:25:08 1999
***************
*** 273,277 ****
USER const *other = users.getitem(name.get(),this);
if (other != NULL){
! status.append_sprintf (
MSG_U(E_DUPLOGIN,"User %s already exist (same login name)\n")
,name.get());
--- 273,277 ----
USER const *other = users.getitem(name.get(),this);
if (other != NULL){
! status.appendf (
MSG_U(E_DUPLOGIN,"User %s already exist (same login name)\n")
,name.get());
***************
*** 369,373 ****
}
if (status != NULL){
! status->sprintf (
MSG_U(E_HOMEUSER,"Home directory of user %s: %s\n %s\n")
,name.get(),wrkdir.get(),msg);
--- 369,373 ----
}
if (status != NULL){
! status->setfromf (
MSG_U(E_HOMEUSER,"Home directory of user %s: %s\n %s\n")
,name.get(),wrkdir.get(),msg);
***************
*** 439,443 ****
if (do_recur){
SSTRING tmp;
! tmp.sprintf ("-R %d.%d %s",uid,gid,dir);
ret = netconf_system_if ("chown",tmp.get());
}else{
--- 439,443 ----
if (do_recur){
SSTRING tmp;
! tmp.setfromf ("-R %d.%d %s",uid,gid,dir);
ret = netconf_system_if ("chown",tmp.get());
}else{