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.14r1/conf.files/lib-install/gnome/.directory linuxconf-1.14r1.1/conf.files/lib-install/gnome/.directory *** linuxconf-1.14r1/conf.files/lib-install/gnome/.directory Wed Dec 31 19:00:00 1969 --- linuxconf-1.14r1.1/conf.files/lib-install/gnome/.directory Sun Mar 14 18:09:11 1999 *************** *** 0 **** --- 1,7 ---- + + [Desktop Entry] + Name=Linuxconf + Icon=gnome-folder.png + Terminal=false + MultipleArgs=false + Type=Directory 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.14r1/conf.files/lib-install/gnome/.order linuxconf-1.14r1.1/conf.files/lib-install/gnome/.order *** linuxconf-1.14r1/conf.files/lib-install/gnome/.order Wed Dec 31 19:00:00 1969 --- linuxconf-1.14r1.1/conf.files/lib-install/gnome/.order Sun Mar 14 22:08:12 1999 *************** *** 0 **** --- 1,4 ---- + main + dialout + shutdown + 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.14r1/conf.files/lib-install/gnome/dialout.desktop linuxconf-1.14r1.1/conf.files/lib-install/gnome/dialout.desktop *** linuxconf-1.14r1/conf.files/lib-install/gnome/dialout.desktop Wed Dec 31 19:00:00 1969 --- linuxconf-1.14r1.1/conf.files/lib-install/gnome/dialout.desktop Sun Mar 14 18:16:25 1999 *************** *** 0 **** --- 1,11 ---- + + [Desktop Entry] + Name=PPP/SLIP control + name[fr]=Contrôle PPP/SLIP + Comment=Shortcut to linuxconf/control panel/shutdown + Comment[fr]=Accès rapide au panneau de contrôle PPP/SLIP + Exec=netconf --dialctl + Terminal=false + MultipleArgs=false + Type=Application + 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.14r1/conf.files/lib-install/gnome/main.desktop linuxconf-1.14r1.1/conf.files/lib-install/gnome/main.desktop *** linuxconf-1.14r1/conf.files/lib-install/gnome/main.desktop Wed Dec 31 19:00:00 1969 --- linuxconf-1.14r1.1/conf.files/lib-install/gnome/main.desktop Sun Mar 14 22:12:08 1999 *************** *** 0 **** --- 1,10 ---- + + [Desktop Entry] + Name=Main menu + Name[fr]=Menu principal + Comment=Main program + Comment[fr]=Menu principal + Exec=linuxconf + Terminal=false + MultipleArgs=false + Type=Application 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.14r1/conf.files/lib-install/gnome/shutdown.desktop linuxconf-1.14r1.1/conf.files/lib-install/gnome/shutdown.desktop *** linuxconf-1.14r1/conf.files/lib-install/gnome/shutdown.desktop Wed Dec 31 19:00:00 1969 --- linuxconf-1.14r1.1/conf.files/lib-install/gnome/shutdown.desktop Sun Mar 14 18:14:11 1999 *************** *** 0 **** --- 1,10 ---- + + [Desktop Entry] + Name=shutdown + name[fr]=Arrêt du système + Comment=Shortcut to linuxconf/control panel/shutdown + Comment[fr]=Accès rapide au panneau d'arrêt du système + Exec=linuxconf --shutdown + Terminal=false + MultipleArgs=false + Type=Application 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.14r1/help.files/cfr/main/introweb.html linuxconf-1.14r1.1/help.files/cfr/main/introweb.html *** linuxconf-1.14r1/help.files/cfr/main/introweb.html Mon Mar 8 18:36:16 1999 --- linuxconf-1.14r1.1/help.files/cfr/main/introweb.html Sun Mar 14 21:58:18 1999 *************** *** 1,8 ****
!+ Welcome to Linuxconf, an interactive configuration and administration + utility for the Linux operating system. +
+ Linuxconf has been created both to help administer + a linux server or workstation and to highlight the underlying + power of the Linux operating system. +
+ It lets you manage + +
+
+
+
+
+
+
+
+
+
+
+
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.14r1/messages/fr/apache.dic linuxconf-1.14r1.1/messages/fr/apache.dic
*** linuxconf-1.14r1/messages/fr/apache.dic Mon Jan 11 19:06:13 1999
--- linuxconf-1.14r1.1/messages/fr/apache.dic Fri Mar 12 20:44:10 1999
***************
*** 1,3 ****
--- 1,9 ----
@version 2
+ !I_DIRRULES
+ :T Vous pouvez entrer des configurations applicables à ce répertoire\n
+ +et ses sous répertoires\n
+ +whîch apply to this directory and its sub-directories\n
+ :E You are allowed to enter configurations\n
+ +which apply to this directory and its sub-directories\n
!I_USAGE
:T module apache\n
***************
*** 59,67 ****
:E Server aliases
:T alias du serveur
- !I_DIRRULES
- :T Vous pouvez entrer des configurations applicables à ce répertoire\n
- +et ses sous répertoires\n
- :E You are allowed to enter configurations\n
- +whîch apply to this directory and its sub-directories\n
!M_DEFAULT
:E Defaults
--- 65,68 ----
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.14r1/messages/fr/dhcpd.dic linuxconf-1.14r1.1/messages/fr/dhcpd.dic
*** linuxconf-1.14r1/messages/fr/dhcpd.dic Sun Feb 28 11:45:00 1999
--- linuxconf-1.14r1.1/messages/fr/dhcpd.dic Fri Mar 12 20:43:55 1999
***************
*** 1,6 ****
@version 0
- !F_NETBIOSNODETYPE
- :E Node type(Netbios)
- :T Type de noeud (Netbios)
!E_NOMATCH
:T Ce sous-réseau n'est pas associé \n
--- 1,3 ----
***************
*** 9,19 ****
+ne pourront être allouées que sur un autre réseau\n
+par l'intermédiaire d'un relais dhcp pour ce serveur
- :Z This subnet is not associated with any\n
- +network adaptor (basic host information).
:E This subnet is not associated with any\n
! +network adaptor (basic host information)\n
! +.This means that IP numbers in this subnet\n
+will only by allocated to some other network\n
+using a dhcp relay to this dhcpd server
!E_USAGE
:T Module dhcpd\n\n --updatedns\n
--- 6,17 ----
+ne pourront être allouées que sur un autre réseau\n
+par l'intermédiaire d'un relais dhcp pour ce serveur
:E This subnet is not associated with any\n
! +network adaptor (basic host information).\n
! +This means that IP numbers in this subnet\n
+will only by allocated to some other network\n
+using a dhcp relay to this dhcpd server
+ !F_NETBIOSNODETYPE
+ :E Node type(Netbios)
+ :T Type de noeud (Netbios)
!E_USAGE
:T Module dhcpd\n\n --updatedns\n
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.14r1/messages/fr/dnsconf.dic linuxconf-1.14r1.1/messages/fr/dnsconf.dic
*** linuxconf-1.14r1/messages/fr/dnsconf.dic Sun Feb 28 11:44:40 1999
--- linuxconf-1.14r1.1/messages/fr/dnsconf.dic Fri Mar 12 20:52:16 1999
***************
*** 1,9 ****
@version 0
- !E_IVLDHOSTIP
- :E Invalid host IP number: %s\n
- :T Mauvaise adresse IP de machine : %s\n
!N_DNSUSAGE
:T Modules dnsconf\n
+\n
+ --newdomain domaine [domaine_template]\n
+ --set machine adresse_ip [adresse_ip ...]\n
--- 1,7 ----
@version 0
!N_DNSUSAGE
:T Modules dnsconf\n
+\n
+ + --deldomain domaine\n
+ --newdomain domaine [domaine_template]\n
+ --set machine adresse_ip [adresse_ip ...]\n
***************
*** 18,21 ****
--- 16,20 ----
:E Module dnsconf\n
+\n
+ + --deldomain domain\n
+ --newdomain domain [ template_domain ]\n
+ --set host ip_number [ip_number ...]\n
***************
*** 28,31 ****
--- 27,36 ----
+\n
+ without argument start the interactive mode\n
+ !E_SETHOSTPART
+ :E Can't set host part for record type %d\n
+ :T Impossible de fixer la partie machine pour l'enregistrement de type %d\n
+ !E_IVLDHOSTIP
+ :E Invalid host IP number: %s\n
+ :T Mauvaise adresse IP de machine : %s\n
!I_ADDPRIM
:T Sélectionnez [Ajouter] pour ajouter une zône primaire
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.14r1/messages/fr/fstab.dic linuxconf-1.14r1.1/messages/fr/fstab.dic
*** linuxconf-1.14r1/messages/fr/fstab.dic Mon Jan 11 19:27:12 1999
--- linuxconf-1.14r1.1/messages/fr/fstab.dic Fri Mar 12 20:52:35 1999
***************
*** 1,3 ****
--- 1,6 ----
@version 0
+ !F_NOLOCKMNT
+ :E Nolock mount
+ :T Nolock mount
!I_ADDDEF
:T Sélectionnez [Ajouter] pour ajouter une nouvelle définition
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.14r1/messages/fr/mailconf.dic linuxconf-1.14r1.1/messages/fr/mailconf.dic
*** linuxconf-1.14r1/messages/fr/mailconf.dic Mon Feb 8 17:18:53 1999
--- linuxconf-1.14r1.1/messages/fr/mailconf.dic Fri Mar 12 20:50:27 1999
***************
*** 1,6 ****
@version 0
- !I_NEWALIAS
- :T Sélectionnez [Ajouter] pour ajouter de nouveaux alias
- :E Select [Add] to add a new aliase
!I_USAGE
:T Module mailconf\n
--- 1,3 ----
***************
*** 8,12 ****
+ --help\n
+ --addvdom domaine [--startuid uid ] [--daliases domain_alias ]\n
! + [--faliase email_aliase_file]\n
+ --delvdom domaine\n
:E Module mailconf\n
--- 5,9 ----
+ --help\n
+ --addvdom domaine [--startuid uid ] [--daliases domain_alias ]\n
! + [--faliase email_aliase_file] [ --quota max_inbox_k] \n
+ --delvdom domaine\n
:E Module mailconf\n
***************
*** 14,19 ****
+ --help\n
+ --addvdom domain [--startuid uid ] [--daliases domain_alias ]\n
! + [--faliase email_aliase_file]\n
+ --delvdom domain\n
!I_ADDENTRY
:T Sélectionnez [Ajouter] pour ajouter une nouvelle entrée
--- 11,25 ----
+ --help\n
+ --addvdom domain [--startuid uid ] [--daliases domain_alias ]\n
! + [--faliase email_aliase_file] [ --quota max_inbox_k] \n
+ --delvdom domain\n
+ !T_ADDMASQ
+ :T Sélectionnez [Ajouter] pour définir une nouvelle règle de masquage
+ :E Select [Add] to define a new masquerading rule
+ !F_QUOTA
+ :E Limit user inbox to (k)
+ :T Limiter la boite aux lettres de l'utilisateur à (k)
+ !I_NEWALIAS
+ :T Sélectionnez [Ajouter] pour ajouter de nouveaux alias
+ :E Select [Add] to add a new aliase
!I_ADDENTRY
:T Sélectionnez [Ajouter] pour ajouter une nouvelle entrée
***************
*** 37,43 ****
:T Sélectionnez [Ajouter] pour ajouter un domaine virtuel
:E Select [Add] to add one virtual domain
- !T_ADDMASQ
- :T Sélectionnez [Ajouter] pour définir une nouvelle règle de masquage
- :E Select[Add] to define a new masquerading rule
!M_ADDZONE
:T Sélectionnez [Ajouter] pour définir une nouvelle zône de fax
--- 43,46 ----
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.14r1/messages/fr/netconf.dic linuxconf-1.14r1.1/messages/fr/netconf.dic
*** linuxconf-1.14r1/messages/fr/netconf.dic Mon Feb 8 17:19:08 1999
--- linuxconf-1.14r1.1/messages/fr/netconf.dic Fri Mar 12 20:48:02 1999
***************
*** 1,20 ****
@version 0
- !F_EMPTYSLOT
- :T Sélectionnez [Ajouter] pour ajouter des emplacements vides à la fin du dialogue
- :E Select [Add] to add empty slots at the end of the dialog
- !F_ADDONE
- :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition
- :E Select [Add] to add a new definition
- !I_TOADDROUTE
- :T Sélectionnez [Ajouter] pour ajouter une nouvelle route
- :E Select [Add] to add a new route
- !I_ADDDEF
- :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition
- :E Select [Add] to add a new definition
- !I_ADDDROPIN
- :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition de dropin
- :E Select [Add] to add a new dropin definition
!I_USAGE
! :E netconf command line options\n
+\n
+ --bootrc rc_dir_path [ previous_rc_dir_path]\n
--- 1,5 ----
@version 0
!I_USAGE
! :T options de la ligne de commande pour netconf\n
+\n
+ --bootrc rc_dir_path [ previous_rc_dir_path]\n
***************
*** 37,43 ****
+ --status\n
+ --update\n
! :T options de la ligne de commande pour netconf\n
+\n
! + --bootrc rc_dir_path [ previous_rc_dir_path]\n
+ --connect site [--fore]\n
+ --dialctl\n
--- 22,28 ----
+ --status\n
+ --update\n
! :E netconf command line options\n
+\n
! + --bootrc rc_dir_path [ previous_rc_dir_path ]\n
+ --connect site [--fore]\n
+ --dialctl\n
***************
*** 58,61 ****
--- 43,67 ----
+ --status\n
+ --update\n
+ !H_DAEMONS
+ :T Nom\tChemin\tMod.
+ :E Name\tPath\tMod.
+ !I_MISC
+ :E Miscellaneous task
+ :T Tâches diverses
+ !F_EMPTYSLOT
+ :T Sélectionnez [Ajouter] pour ajouter des emplacements vides à la fin du dialogue
+ :E Select [Add] to add empty slots at the end of the dialog
+ !F_ADDONE
+ :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition
+ :E Select [Add] to add a new definition
+ !I_TOADDROUTE
+ :T Sélectionnez [Ajouter] pour ajouter une nouvelle route
+ :E Select [Add] to add a new route
+ !I_ADDDEF
+ :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition
+ :E Select [Add] to add a new definition
+ !I_ADDDROPIN
+ :T Sélectionnez [Ajouter] pour ajouter une nouvelle définition de dropin
+ :E Select [Add] to add a new dropin definition
!F_IPALIASES
:T alias IP ou plage
***************
*** 213,219 ****
:E Updating user account
:T Mise à jour du compte utilisateur
- !H_DAEMONS
- :E Mod.\tName\tPath
- :T Mod.\tNom\tChemin
!H_NETDEV
:E Network device
--- 219,222 ----
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.14r1/messages/fr/pppdialin.dic linuxconf-1.14r1.1/messages/fr/pppdialin.dic
*** linuxconf-1.14r1/messages/fr/pppdialin.dic Mon Jan 11 18:46:20 1999
--- linuxconf-1.14r1.1/messages/fr/pppdialin.dic Fri Mar 12 20:42:55 1999
***************
*** 1,3 ****
--- 1,6 ----
@version 0
+ !F_OURIP
+ :E Local IP number
+ :T Adresse IP locale
!T_USAGE
:T Module pppdialin\n\n Aucune option disponible en ligne de commande\n
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.14r1/messages/fr/samba.dic linuxconf-1.14r1.1/messages/fr/samba.dic
*** linuxconf-1.14r1/messages/fr/samba.dic Mon Jan 11 18:54:15 1999
--- linuxconf-1.14r1.1/messages/fr/samba.dic Fri Mar 12 20:44:22 1999
***************
*** 1,3 ****
--- 1,6 ----
@version 1
+ !T_SHARES
+ :T Partages de disques
+ :E Disk shares
!I_NEWSHARE
:T Sélectionnez [Ajouter] pour ajouter un nouveau partage de disque
***************
*** 33,39 ****
:E Share name\tDescription
:T Nom du partage\tDescription
- !T_SHARES
- :E DIsk shares
- :T Partages de disques
!I_SHARES
:E You can define multiple independant entry\npoints in your file server
--- 36,39 ----
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.14r1/messages/fr/status.dic linuxconf-1.14r1.1/messages/fr/status.dic
*** linuxconf-1.14r1/messages/fr/status.dic Wed Nov 18 17:58:11 1998
--- linuxconf-1.14r1.1/messages/fr/status.dic Fri Mar 12 20:42:39 1999
***************
*** 1,3 ****
--- 1,6 ----
@version 0
+ !E_NOTDONE
+ :E Not done yet!
+ :T Pas encore fait!
!M_INTERRUPTS
:E interrupts mapping
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.14r1/modules/mailconf/mod_mailconf.cc linuxconf-1.14r1.1/modules/mailconf/mod_mailconf.cc
*** linuxconf-1.14r1/modules/mailconf/mod_mailconf.cc Mon Mar 8 18:38:37 1999
--- linuxconf-1.14r1.1/modules/mailconf/mod_mailconf.cc Sun Mar 14 12:51:01 1999
***************
*** 236,239 ****
--- 236,240 ----
}
if (strcmp(pt,"mailconf")==0){
+ ret = -1;
if (argc == 1){
ret = mailconf_mainmenu ();
***************
*** 245,249 ****
if (strcmp(argv[1],"--addvdom")==0){
if (netconf_rootaccess()){
! vdomain_add (argv[2],argc-3,(const char **)(argv+3));
}
}else{
--- 246,250 ----
if (strcmp(argv[1],"--addvdom")==0){
if (netconf_rootaccess()){
! ret = vdomain_add (argv[2],argc-3,(const char **)(argv+3));
}
}else{
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.14r1/rules.mak linuxconf-1.14r1.1/rules.mak
*** linuxconf-1.14r1/rules.mak Sat Mar 13 23:44:33 1999
--- linuxconf-1.14r1.1/rules.mak Sun Mar 14 15:58:07 1999
***************
*** 12,16 ****
LINUXCONF_REV=1.14
LINUXCONF_SUBREV=1
! LINUXCONF_SUBSUBREV=0
ifeq ($(LINUXCONF_SUBSUBREV),0)
ifeq ($(LINUXCONF_SUBREV),0)
--- 12,16 ----
LINUXCONF_REV=1.14
LINUXCONF_SUBREV=1
! 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.14r1/userconf/upass.cc linuxconf-1.14r1.1/userconf/upass.cc
*** linuxconf-1.14r1/userconf/upass.cc Sat Jan 30 22:44:14 1999
--- linuxconf-1.14r1.1/userconf/upass.cc Sun Mar 14 16:39:05 1999
***************
*** 13,58 ****
,CONFIGF_OPTIONNAL);
! /*
! Let a user change its own password
! This will generally be used by PPP or POP users
! who can't do it otherwise. This is only usable with the html mode.
! */
! void userconf_editupass(
! USERS &users,
! const char *server)
{
! int nof=0;
! DIALOG dia;
! {
! /* #Specification: html password dialog / introduction
! The admin may supply a file /etc/passwd.htmlintro. This
! file must contain html and will be inserted in the
! html dialog letting a user change his password.
! */
! FILE *fin = f_intro.fopen ("r");
! if (fin != NULL){
! char buf[500];
! while (fgets(buf,sizeof(buf)-1,fin)!=NULL){
! dia.html_top ("%s",buf);
! }
! fclose (fin);
}
}
dia.html_intro (MSG_U(I_SERVER
,"
\n" --- 13,38 ---- ,CONFIGF_OPTIONNAL); ! void upass_setintro (DIALOG &dia, const char *server) { ! /* #Specification: html password dialog / introduction ! The admin may supply a file /etc/passwd.htmlintro. This ! file must contain html and will be inserted in the ! html dialog letting a user change his password. ! */ ! FILE *fin = f_intro.fopen ("r"); ! if (fin != NULL){ ! char buf[500]; ! while (fgets(buf,sizeof(buf)-1,fin)!=NULL){ ! dia.html_top ("%s",buf); } + fclose (fin); } dia.html_intro (MSG_U(I_SERVER ,"
\n"
***************
*** 63,68 ****
--- 43,76 ----
"\n"
"\n");
+ }
+ /*
+ Let a user change its own password
+ This will generally be used by PPP or POP users
+ who can't do it otherwise. This is only usable with the html mode.
+ */
+ void userconf_editupass(
+ USERS &users,
+ const char *server)
+ {
+ int nof=0;
while (1){
+ DIALOG dia;
+ upass_setintro(dia,server);
+ dia.html_intro (MSG_U(I_IDENTIFY
+ ,"Enter you account id and your current password\n"
+ "followed by the new password you want. You must\n"
+ "enter it twice to make sure you have it right"));
+
+ SSTRING account;
+ dia.newf_str (MSG_U(F_ACCOUNT,"Account"),account);
+ SSTRING pass;
+ dia.newf_pass (MSG_U(F_CURPASSWORD,"Current password"),pass);
+ SSTRING npass1;
+ SSTRING npass2;
+ dia.newf_pass (MSG_U(F_NEWPASSWORD,"New password"),npass1);
+ dia.newf_pass (MSG_U(F_PASSCONFIRM,"New password again"),npass2);
+ upass_setend (dia);
+
if (dia.edit (MSG_U(T_IDENTIFY,"Change your password")
,""
***************
*** 99,103 ****
xconf_notice (MSG_U(N_NEWPASSOK
,"Your new password has been accepted!"));
- break;
}
}
--- 107,110 ----
***************
*** 115,131 ****
{
if (perm_fct_change != NULL){
! DIALOG dia;
! SSTRING account;
! dia.newf_str (MSG_R(F_ACCOUNT),account);
! int nof = 0;
! if (dia.edit (MSG_U(T_YOURNAME,"Your accound ID")
! ,MSG_U(I_YOURNAME,"Please enter your account name")
! ,help_nil
! ,nof)==MENU_ACCEPT){
! int ret = (*perm_fct_change)(account.get(),0);
! if (ret == -1){
! xconf_error (MSG_R(E_PASSCHG));
}else{
! xconf_notice (MSG_R(N_NEWPASSOK));
}
}
--- 122,144 ----
{
if (perm_fct_change != NULL){
! while (1){
! DIALOG dia;
! upass_setintro(dia,hostname);
! SSTRING account;
! dia.newf_str (MSG_R(F_ACCOUNT),account);
! upass_setend (dia);
! int nof = 0;
! if (dia.edit (MSG_U(T_YOURNAME,"Your accound ID")
! ,MSG_U(I_YOURNAME,"Please enter your account name")
! ,help_nil
! ,nof)==MENU_ACCEPT){
! int ret = (*perm_fct_change)(account.get(),0);
! if (ret == -1){
! xconf_error (MSG_R(E_PASSCHG));
! }else{
! xconf_notice (MSG_R(N_NEWPASSOK));
! }
}else{
! break;
}
}
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.14r1/userconf/userconf.p linuxconf-1.14r1.1/userconf/userconf.p
*** linuxconf-1.14r1/userconf/userconf.p Sat Jan 30 22:46:08 1999
--- linuxconf-1.14r1.1/userconf/userconf.p Sun Mar 14 16:09:52 1999
***************
*** 83,90 ****
int special_init (const char *group, USER *&special);
PRIVILEGE *special_getpriv (const char *group);
! /* upass.cc 30/01/99 22.44.14 */
void userconf_editupass (USERS&users, const char *server);
void userconf_editupass (void);
! /* user.cc 30/01/99 22.39.52 */
int user_splitline (const char *line, char words[9][100]);
bool user_isadmin (const char *loginid);
--- 83,92 ----
int special_init (const char *group, USER *&special);
PRIVILEGE *special_getpriv (const char *group);
! /* upass.cc 14/03/99 16.09.46 */
! void upass_setintro (DIALOG&dia, const char *server);
! void upass_setend (DIALOG&dia);
void userconf_editupass (USERS&users, const char *server);
void userconf_editupass (void);
! /* user.cc 08/03/99 21.40.04 */
int user_splitline (const char *line, char words[9][100]);
bool user_isadmin (const char *loginid);
***************
*** 92,96 ****
/* user1.cc 02/07/97 16.29.32 */
/* usercomng.cc 08/10/98 11.34.40 */
! /* userconf.cc 06/01/99 21.42.26 */
void userconf_edit (void);
int userconf_passwd (int argc, char *argv[]);
--- 94,98 ----
/* user1.cc 02/07/97 16.29.32 */
/* usercomng.cc 08/10/98 11.34.40 */
! /* userconf.cc 30/01/99 22.48.38 */
void userconf_edit (void);
int userconf_passwd (int argc, char *argv[]);
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.14r1/userconf/userconf.pm linuxconf-1.14r1.1/userconf/userconf.pm
*** linuxconf-1.14r1/userconf/userconf.pm Sat Jan 30 22:46:08 1999
--- linuxconf-1.14r1.1/userconf/userconf.pm Sun Mar 14 16:09:52 1999
***************
*** 130,135 ****
/* shells.cc 20/12/98 14.31.52 */
/* special.cc 09/12/96 16.22.12 */
! /* upass.cc 30/01/99 22.44.14 */
! /* user.cc 30/01/99 22.39.52 */
PUBLIC bool USER::statuschanged (bool&active);
PRIVATE void USER::init (const char *_name,
--- 130,135 ----
/* shells.cc 20/12/98 14.31.52 */
/* special.cc 09/12/96 16.22.12 */
! /* upass.cc 14/03/99 16.09.46 */
! /* user.cc 08/03/99 21.40.04 */
PUBLIC bool USER::statuschanged (bool&active);
PRIVATE void USER::init (const char *_name,
***************
*** 227,231 ****
PUBLIC void USERACCT_COMNGS::set_bool (const char *var, bool val);
PUBLIC bool USERACCT_COMNGS::get_bool (const char *var)const;
! /* userconf.cc 06/01/99 21.42.26 */
/* users.cc 30/01/99 22.46.02 */
PRIVATE void USERS::readusers (void);
--- 227,231 ----
PUBLIC void USERACCT_COMNGS::set_bool (const char *var, bool val);
PUBLIC bool USERACCT_COMNGS::get_bool (const char *var)const;
! /* userconf.cc 30/01/99 22.48.38 */
/* users.cc 30/01/99 22.46.02 */
PRIVATE void USERS::readusers (void);