Wijzig Squid paswoord

--------------------- PatchSet 2985 Date: 2001/09/09 10:34:28 Author: serassio Branch: nt-2_3-tolsty Tag: (none) Log: Fixed indent problems Members: contrib/chpasswd/Dutch.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/English.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/French.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/German.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/Hungarian.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/Italian.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/Portuguese.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/Russian.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/Spanish.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/chpasswd.c:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/conf.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/chpasswd/language.h:1.1.2.1.2.1->1.1.2.1.2.2 contrib/htpasswd/htpasswd.c:1.1.2.1.2.1->1.1.2.1.2.2 Index: squid/contrib/chpasswd/Dutch.h =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/Dutch.h,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/chpasswd/Dutch.h 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/chpasswd/Dutch.h 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -1,5 +1,7 @@ /* Dutch language added by Richard Baselier */ + #if defined(Dutch) + char *msg01 = "Geen schrijfpermissie op paswoord file:"; char *msg02 = "Nieuw paswoord leeg of te kort (minder dan"; char *msg03 = "karakters)."; @@ -23,109 +25,92 @@ char *msg21 = "Minimum aantal speciale karakters (toetsenbord)"; char *msg22 = "Wijzig uw Squid Account Paswoord"; char *msg23 = "Authorisatie file moet eigenaar root hebben. Aub. README."; -char *msg24 = - "Authorisatie file heeft verkeerde mode (moet 755 zijn). Aub. README."; -char *msg25 = "Kan authorisatie file niet openen."; +char *msg24 = "Authorisatie file heeft verkeerde mode (moet 755 zijn). Aub. README."; +char *msg25 = "Kan authorisatie file niet openen."; char *msg26 = "U bent niet bevoegd het paswoord te wijzigen."; char *msg27 = "Authorisatie file niet gevonden."; -static void -UserForm(char *minlen, char *maxlen, char *minchar, char *minnum, char *minspec, - char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, - char *width, char *height, char *header, char *bgimage) +static void UserForm(char *minlen, char *maxlen, char *minchar, char *minnum, char *minspec, char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, char *width, char *height, char *header, char *bgimage) { - char rules[255] = "

Compositie:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Wijzig Squid paswoord\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Voor beveiligings redenen, pas deze regels toe op uw nieuwe paswoord :\n"); - printf("

Het paswoord is hoofdletter gevoelig, dit betekent dat 'A' niet gelijk is aan 'a'.
\n"); - printf - ("
U mag letters, nummers, en andere speciale karakters op uw toetsenbord gebruiken.
\n"); - printf("
Nieuw paswoord regels:
"); - printf - ("
- Lengte: minimum %s, maximum %s characters.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, - " karakters (a-z, A-Z): %s", rucolor, - minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " nummers (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " speciale karakters (toetsenbord): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " vrije keus", rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf("
Uw nieuw paswoord is effectief binnen ongeveer 15 minuten.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Compositie:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Wijzig Squid paswoord\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Voor beveiligings redenen, pas deze regels toe op uw nieuwe paswoord :\n"); + printf("

Het paswoord is hoofdletter gevoelig, dit betekent dat 'A' niet gelijk is aan 'a'.
\n"); + printf("
U mag letters, nummers, en andere speciale karakters op uw toetsenbord gebruiken.
\n"); + printf("
Nieuw paswoord regels:
"); + printf("
- Lengte: minimum %s, maximum %s characters.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," karakters (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," nummers (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," speciale karakters (toetsenbord): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," vrije keus",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Uw nieuw paswoord is effectief binnen ongeveer 15 minuten.\n"); + printf("

Composition:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Change Squid Password\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("For security reasons, remember these rules about your new password:\n"); - printf("

The password is letter-case sensitive, meaning an 'A' is not the same as an 'a'.
\n"); - printf - ("
You may use letters, numbers, and other special characters on your keyboard.
\n"); - printf("
New password rules:
"); - printf - ("
- Length: minimum %s, maximum %s characters.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, - " characters (a-z, A-Z): %s", rucolor, - minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " numbers (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " special characters (keyboard): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " free choice", rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
Your new password will be effective within about 15 minutes.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Composition:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Change Squid Password\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("For security reasons, remember these rules about your new password:\n"); + printf("

The password is letter-case sensitive, meaning an 'A' is not the same as an 'a'.
\n"); + printf("
You may use letters, numbers, and other special characters on your keyboard.
\n"); + printf("
New password rules:
"); + printf("
- Length: minimum %s, maximum %s characters.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," characters (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," numbers (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," special characters (keyboard): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," free choice",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Your new password will be effective within about 15 minutes.\n"); + printf("

Composition:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Mise � jour du mot de passe Squid\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Pour des raisons de s�curit�, rappelez-vous les r�gles pour votre nouveau mot de passe:\n"); - printf("

Le mot de passe tient compte de la casse, cela signifie qu'un 'A' est diff�rent d'un 'a'.
\n"); - printf - ("
Il est possible d'utiliser des lettres, des chiffres et des caract�res sp�ciaux (disponible sur le clavier).
\n"); - printf("
R�gles du nouveau mot de passe:
"); - printf - ("
- Longueur: minimum %s, maximum %s caract�res.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, - " caract�res (a-z, A-Z): %s", rucolor, - minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " chiffres (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " caract�res sp�ciaux (clavier): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " libre", rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
Votre nouveau mot de passe deviendra actif dans 15 minutes environs.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Composition:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Mise � jour du mot de passe Squid\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Pour des raisons de s�curit�, rappelez-vous les r�gles pour votre nouveau mot de passe:\n"); + printf("

Le mot de passe tient compte de la casse, cela signifie qu'un 'A' est diff�rent d'un 'a'.
\n"); + printf("
Il est possible d'utiliser des lettres, des chiffres et des caract�res sp�ciaux (disponible sur le clavier).
\n"); + printf("
R�gles du nouveau mot de passe:
"); + printf("
- Longueur: minimum %s, maximum %s caract�res.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," caract�res (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," chiffres (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," caract�res sp�ciaux (clavier): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," libre",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Votre nouveau mot de passe deviendra actif dans 15 minutes environs.\n"); + printf("

Zusammensetzung:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Aendern des Zugriffspasswortes\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Aus Sicherheitsgründen sollten Sie sich bei Eingabe ihres neuen Passworts an folgenden Regeln orientieren:\n"); - printf("

Im Passwort wird zwischen Gross- und Kleinbuchstaben unterschieden. 'A' ist also nicht gleich 'a'.
\n"); - printf - ("
Sie können Buchstaben, Ziffern und andere Zeichen auf Ihrer Tastatur verwenden.
\n"); - - - printf("
Regeln für das neue Passwort:
"); - printf - ("
- Länge: mindestens %s, höchstens %s Zeichen.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, - " Buchstaben (a-z, A-Z): %s", rucolor, - minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " Ziffern (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " Sonderzeichen (Tastatur): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " freie Zeichenwahl", - rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
Ihr neues Passwort wird innerhalb der nächsten 15 Minuten aktiviert.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Zusammensetzung:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Aendern des Zugriffspasswortes\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Aus Sicherheitsgründen sollten Sie sich bei Eingabe ihres neuen Passworts an folgenden Regeln orientieren:\n"); + printf("

Im Passwort wird zwischen Gross- und Kleinbuchstaben unterschieden. 'A' ist also nicht gleich 'a'.
\n"); + printf("
Sie können Buchstaben, Ziffern und andere Zeichen auf Ihrer Tastatur verwenden.
\n"); + + + printf("
Regeln für das neue Passwort:
"); + printf("
- Länge: mindestens %s, höchstens %s Zeichen.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," Buchstaben (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," Ziffern (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," Sonderzeichen (Tastatur): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," freie Zeichenwahl",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Ihr neues Passwort wird innerhalb der nächsten 15 Minuten aktiviert.\n"); + printf("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Biztons�gi okok miatt eml�kezz az al�bbi szab�lyokra az �j jelsz� megad�sakor:\n"); - printf("

A jelsz�ban a kis �s nagy bet� k�l�nb�zik, vagyis az 'A' �s 'a' nem azonos.
\n"); - printf - ("
Haszn�lhatsz bet�ket, sz�mokat �s speci�lis karakterek a billenty�zetr�l.
\n"); - printf("
�j jelsz� szab�lyai:
"); - printf - ("
- Hossza: minimum %s, maximum %s karakter.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, " bet�k (a-z, A-Z): %s", - rucolor, minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " sz�mok (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " speci�lis karakterek (billenty�zetr�l): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " szabadon v�lasztva", - rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf("
Az �j jelszavad kb. 15 percen bel�l �rv�nyes lesz.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Biztons�gi okok miatt eml�kezz az al�bbi szab�lyokra az �j jelsz� megad�sakor:\n"); + printf("

A jelsz�ban a kis �s nagy bet� k�l�nb�zik, vagyis az 'A' �s 'a' nem azonos.
\n"); + printf("
Haszn�lhatsz bet�ket, sz�mokat �s speci�lis karakterek a billenty�zetr�l.
\n"); + printf("
�j jelsz� szab�lyai:
"); + printf("
- Hossza: minimum %s, maximum %s karakter.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," bet�k (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," sz�mok (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," speci�lis karakterek (billenty�zetr�l): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," szabadon v�lasztva",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Az �j jelszavad kb. 15 percen bel�l �rv�nyes lesz.\n"); + printf("

Composizione:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Cambia la Password del server Squid\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Per ragioni di sicurezza, ricorda queste avvertenze riguardo alla tua password:\n"); - printf("

La password e' case-sensitive, il che vuol dire che 'A' non e' la stessa cosa di 'a'.
\n"); - printf - ("
Puoi usare lettere, numeri o caratteri speciali della tua tastiera.
\n"); - printf("
Regole riguardanti la nuova password:
"); - printf - ("
- Lunghezza: minimo %s, massimo %s caratteri.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, " lettere (a-z, A-Z): %s", - rucolor, minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " numeri (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " caratteri speciali (eg: %,&,*,ecc.): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " Scelta libera", rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf("
La tua nuova password sara' attivata entro 15 minuti.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Composizione:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Cambia la Password del server Squid\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Per ragioni di sicurezza, ricorda queste avvertenze riguardo alla tua password:\n"); + printf("

La password e' case-sensitive, il che vuol dire che 'A' non e' la stessa cosa di 'a'.
\n"); + printf("
Puoi usare lettere, numeri o caratteri speciali della tua tastiera.
\n"); + printf("
Regole riguardanti la nuova password:
"); + printf("
- Lunghezza: minimo %s, massimo %s caratteri.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," lettere (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," numeri (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," caratteri speciali (eg: %,&,*,ecc.): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," Scelta libera",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
La tua nuova password sara' attivata entro 15 minuti.\n"); + printf("

Composição:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" Alteração de senha do Squid\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Por medida de segurança, lembre-se das regras abaixo para escolher sua senha:\n"); - printf("

A senha pode conter letras maiúsculas e/ou minúsculas, números ou qualquer caracter do teclado.
\n"); - printf("
Regras para a nova senha:
"); - printf - ("
- Comprimento: mínimo %s, máximo %s caracteres.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, " letras (a-z, A-Z): %s", - rucolor, minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " números (0-9): %s", rucolor, - minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " caracteres especiaus (teclado): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " livre escolha.", - rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
Sua nova senha será efetivada em torno de 15 minutos.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Composição:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Alteração de senha do Squid\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Por medida de segurança, lembre-se das regras abaixo para escolher sua senha:\n"); + printf("

A senha pode conter letras maiúsculas e/ou minúsculas, números ou qualquer caracter do teclado.
\n"); + printf("
Regras para a nova senha:
"); + printf("
- Comprimento: mínimo %s, máximo %s caracteres.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," letras (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," números (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," caracteres especiaus (teclado): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," livre escolha.",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
Sua nova senha será efetivada em torno de 15 minutos.\n"); + printf("

�� :"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf(" �� Squid\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("�� , �� :\n"); - printf("

�� , �.�. 'A' �� , �� 'a'.
\n"); - printf - ("
�� , �� .
\n"); - printf("
�� :
"); - printf - ("
- ��: �� %s, �� %s ��.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, " �� (a-z, A-Z): %s", - rucolor, minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, " �� (0-9): %s", - rucolor, minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " �� (� ��): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " �� ", - rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
�� , �� 15 ��.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); - - fflush(stdout); - return; - -} -#endif +/* Russian language added by Andrew */ + +#if defined(Russian) + +char *msg01 = "�� :"; +char *msg02 = "�� "; +char *msg03 = "��."; +char *msg04 = "�� "; +char *msg05 = "��, �� . �� ."; +char *msg06 = "�� ."; +char *msg07 = "�� :"; +char *msg08 = "�� ."; +char *msg09 = "�� :"; +char *msg10 = "�� ."; +char *msg11 = "�� "; +char *msg12 = ""; +char *msg13 = "��:"; +char *msg14 = "�� ."; +char *msg15 = "�� :"; +char *msg16 = "�� log-��:"; +char *msg17 = "�� ."; +char *msg18 = "��, �� :"; +char *msg19 = "�� (a-z, A-Z)"; +char *msg20 = "�� (0-9)"; +char *msg21 = "�� (� ��)"; +char *msg22 = "�� Squid"; +char *msg23 = "�� root. ��, �� README."; +char *msg24 = "�� 755. ��, �� README."; +char *msg25 = "�� ."; +char *msg26 = "� �� ."; +char *msg27 = "�� ."; + +static void UserForm(char *minlen, char *maxlen, char *minchar, char *minnum, char *minspec, char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, char *width, char *height, char *header, char *bgimage) +{ + + char rules[255] = "

�� :"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" �� Squid\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("�� , �� :\n"); + printf("

�� , �.�. 'A' �� , �� 'a'.
\n"); + printf("
�� , �� .
\n"); + printf("
�� :
"); + printf("
- ��: �� %s, �� %s ��.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," �� (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," �� (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," �� (� ��): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," �� ",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
�� , �� 15 ��.\n"); + printf("

\n"); + printf("\n"); + printf("%s-%s\n",URL,PGM,VERSION); + printf("\n"); + printf("\n"); + + fflush(stdout); + return; + +} +#endif Index: squid/contrib/chpasswd/Spanish.h =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/Spanish.h,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/chpasswd/Spanish.h 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/chpasswd/Spanish.h 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -1,13 +1,12 @@ /* Spanish language added by Horacio Diaz Requejo */ + #if defined(Spanish) -char *msg01 = - "El archivo de contraseñas no tiene permisos para ser modificado:"; -char *msg02 = - "La nueva contraseña es muy pequeña (tiene menos de"; + +char *msg01 = "El archivo de contraseñas no tiene permisos para ser modificado:"; +char *msg02 = "La nueva contraseña es muy pequeña (tiene menos de"; char *msg03 = "caracteres)."; char *msg04 = "La nueva contraseña es muy grande (tiene mas de"; -char *msg05 = - "Porfavor, no use la misma contraseña que tenia anteriormente"; +char *msg05 = "Porfavor, no use la misma contraseña que tenia anteriormente"; char *msg06 = "La nueva contraseña no coincide en ambos campos."; char *msg07 = "No pudo abrir el archivo de contraseñas:"; char *msg08 = "No se pudo crear un archivo temporal."; @@ -20,122 +19,98 @@ char *msg15 = "No pudo abrir el archivo de configuración:"; char *msg16 = "No se pudo abrir el archivo de logs:"; char *msg17 = "La nueva contrasena es inválida."; -char *msg18 = - "Porfavor, utilize las siguientes reglas para contruir su nueva contraseña:"; +char *msg18 = "Porfavor, utilize las siguientes reglas para contruir su nueva contraseña:"; char *msg19 = "Utilize cualquiera de los siguientes caracteres (a-z, A-Z)"; char *msg20 = "Utilize números (0-9)"; char *msg21 = "Utilize caracteres especiales (/,-,$,%,^,etc)"; char *msg22 = "Cambiando la contraseña de navegación en Internet"; -char *msg23 = - "El archivo de autorización debe pertenecer a root. Porfavor lea el README."; -char *msg24 = - "Los permisos del archivo de autorización son incorrectos (deben ser 755). Porfavor lea el README."; +char *msg23 = "El archivo de autorización debe pertenecer a root. Porfavor lea el README."; +char *msg24 = "Los permisos del archivo de autorización son incorrectos (deben ser 755). Porfavor lea el README."; char *msg25 = "No se pudo abrir el archivo de autorización."; char *msg26 = "Usted no esta autorizado a cambiar contraseñas."; char *msg27 = "No se encontro el archivo de autorización."; -static void -UserForm(char *minlen, char *maxlen, char *minchar, char *minnum, char *minspec, - char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, - char *width, char *height, char *header, char *bgimage) +static void UserForm(char *minlen, char *maxlen, char *minchar, char *minnum, char *minspec, char *bgcolor, char *txcolor, char *ticolor, char *rucolor, char *logo, char *width, char *height, char *header, char *bgimage) { - char rules[255] = "

Sintaxis del password:"; - char wrules[255]; - int frules = 0; - - printf("Content-type: text/html\n"); - puts("\n"); - printf("\n"); - printf("\n"); - printf - (" Cambio de contraseña para navegar en internet\n"); - printf("\n"); - printf("\n", bgcolor, txcolor, - bgimage); - - if (strlen(logo) > 0) - printf - ("

%s

\n", - logo, width, height, ticolor, header); - else - printf("

%s

\n", ticolor, header); - - printf - ("Por razones de seguridad, recuerde utilizar las siguientes reglas al momento de elegir su nueva contraseña:\n"); - printf("

La contraseña es sensitiva a las mayúsculas y minúsculas, es decir, una 'A' no es igual a una 'a'.
\n"); - printf - ("
Al seleccionar su nueva contraseña debe utilizar letras, números y caractares especiales.
\n"); - printf("
Reglas para crear su nueva contraseña:
"); - printf - ("
- Longitud de la contraseña: minimo %s, maximo %s de caracteres.
  \n", - rucolor, minlen, rucolor, maxlen); - - if (strcmp(minchar, "0") != 0) { - sprintf(wrules, - " caracteres (a-z, A-Z): %s", rucolor, - minchar); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minnum, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " números (0-9): %s", rucolor, - minnum); - strcat(rules, wrules); - frules = 1; - } - if (strcmp(minspec, "0") != 0) { - if (frules) - strcat(rules, ", "); - sprintf(wrules, - " caracteres especiales (#,/,-,etc): %s", - rucolor, minspec); - strcat(rules, wrules); - frules = 1; - } - if (!frules) { - sprintf(wrules, " A elección libre", - rucolor); - strcat(rules, wrules); - } - strcat(rules, "
  "); - printf(rules); - printf("
\n"); - - printf - ("
El nuevo password comenzará a funcionar aproximadamente en 15 minutos.\n"); - printf("

\n"); - printf("\n"); - printf("%s-%s\n", URL, PGM, VERSION); - printf("\n"); - printf("\n"); + char rules[255] = "

Sintaxis del password:"; + char wrules[255]; + int frules=0; + + printf("Content-type: text/html\n"); + puts("\n"); + printf("\n"); + printf("\n"); + printf(" Cambio de contraseña para navegar en internet\n"); + printf("\n"); + printf("\n",bgcolor,txcolor,bgimage); + + if(strlen(logo) > 0) + printf("

%s

\n",logo,width,height,ticolor,header); + else + printf("

%s

\n",ticolor,header); + + printf("Por razones de seguridad, recuerde utilizar las siguientes reglas al momento de elegir su nueva contraseña:\n"); + printf("

La contraseña es sensitiva a las mayúsculas y minúsculas, es decir, una 'A' no es igual a una 'a'.
\n"); + printf("
Al seleccionar su nueva contraseña debe utilizar letras, números y caractares especiales.
\n"); + printf("
Reglas para crear su nueva contraseña:
"); + printf("
- Longitud de la contraseña: minimo %s, maximo %s de caracteres.
  \n",rucolor,minlen,rucolor,maxlen); + + if(strcmp(minchar,"0") != 0) { + sprintf(wrules," caracteres (a-z, A-Z): %s",rucolor,minchar); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minnum,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," números (0-9): %s",rucolor,minnum); + strcat(rules,wrules); + frules=1; + } + if(strcmp(minspec,"0") != 0) { + if(frules) + strcat(rules,", "); + sprintf(wrules," caracteres especiales (#,/,-,etc): %s",rucolor,minspec); + strcat(rules,wrules); + frules=1; + } + if(!frules){ + sprintf(wrules," A elección libre",rucolor); + strcat(rules,wrules); + } + strcat(rules,"
  "); + printf(rules); + printf("
\n"); + + printf("
El nuevo password comenzará a funcionar aproximadamente en 15 minutos.\n"); + printf("

\n"); + printf("\n"); + printf("%s-%s\n",URL,PGM,VERSION); + printf("\n"); + printf("\n"); - fflush(stdout); - return; + fflush(stdout); + return; } #endif Index: squid/contrib/chpasswd/chpasswd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/chpasswd.c,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/chpasswd/chpasswd.c 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/chpasswd/chpasswd.c 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -10,105 +10,98 @@ #define MAXLEN 1024 #define hhex(x) (((x) >= '0' && (x) <= '9') || ((x) >= 'a' && (x) <= 'f') || \ ((x) >= 'A' && (x) <= 'F')) -char *tn; +char *tn; static void fixpwd(str); -static int htoi(s); -void getconf(ConfigFile, IpAuth, PwdFile, PwdMinLen, PwdMaxLen, PwdLogFile, - BgColor, TxColor, TiColor, RuColor, Logo, Width, Height, Header, BgImage, - SmtpUser, SmtpSubject); -static void vrfyrule(unsigned char *, unsigned char *, unsigned char *, - unsigned char *); -static void vrfyauth(IpAuth, PwdLogFile, PwdFile, SmtpUser, SmtpSubject); +static int htoi(s); +void getconf(ConfigFile,IpAuth,PwdFile,PwdMinLen,PwdMaxLen,PwdLogFile,BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,SmtpUser,SmtpSubject); +static void vrfyrule(unsigned char *, unsigned char *, unsigned char *, unsigned char *); +static void vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject); eperror(s); -void -main(argc, argv) - int argc; - char *argv[]; -{ - - FILE *fpw, *tmp; - char buf[MAXLEN]; - char User[255]; - char PUser[255]; - char WUser[255]; - char Old_pw[255]; - char WOld_pw[255]; - char New_pw1[255]; - char New_pw2[255]; - char Action[255]; - char Msg[MAXLEN]; - char command[255]; - char PwdFile[MAXLEN] = "c:\\squid23\\etc\\passwd"; - char IpAuth[MAXLEN] = ""; - char PwdMinLen[255] = "4"; - char PwdMaxLen[255] = "10"; - char ShowPwd[255] = "no"; - char PwdMinChar[255] = "0"; - char PwdMinNum[255] = "0"; - char PwdMinSpec[255] = "0"; - char BgColor[255] = "white"; - char TiColor[255] = "green"; - char TxColor[255] = "blue"; - char RuColor[255] = "red"; - char Logo[MAXLEN] = ""; - char Width[MAXLEN] = "80"; - char Height[MAXLEN] = "80"; - char Header[MAXLEN]; - char BgImage[MAXLEN] = ""; - char SmtpUser[MAXLEN] = ""; - char SmtpSubject[MAXLEN] = "CHPASSWD EVENT"; - char InputBuffer[1024]; - char ConfigFile[255]; - char PwdLogFile[255]; - char *pContentLength; - char *str; - char *cpw, salt[3]; - int ContentLength; - int i; - int x, ok = 0; +void main(argc, argv) + int argc; + char *argv[]; +{ + + FILE *fpw, + *tmp; + char buf[MAXLEN]; + char User[255]; + char PUser[255]; + char WUser[255]; + char Old_pw[255]; + char WOld_pw[255]; + char New_pw1[255]; + char New_pw2[255]; + char Action[255]; + char Msg[MAXLEN]; + char command[255]; + char PwdFile[MAXLEN]="c:\\squid23\\etc\\passwd"; + char IpAuth[MAXLEN]=""; + char PwdMinLen[255]="4"; + char PwdMaxLen[255]="10"; + char ShowPwd[255]="no"; + char PwdMinChar[255]="0"; + char PwdMinNum[255]="0"; + char PwdMinSpec[255]="0"; + char BgColor[255]="white"; + char TiColor[255]="green"; + char TxColor[255]="blue"; + char RuColor[255]="red"; + char Logo[MAXLEN]=""; + char Width[MAXLEN]="80"; + char Height[MAXLEN]="80"; + char Header[MAXLEN]; + char BgImage[MAXLEN]=""; + char SmtpUser[MAXLEN]=""; + char SmtpSubject[MAXLEN]="CHPASSWD EVENT"; + char InputBuffer[1024]; + char ConfigFile[255]; + char PwdLogFile[255]; + char *pContentLength; + char *str; + char *cpw, + salt[3]; + int ContentLength; + int i; + int x, + ok = 0; tn = NULL; fpw = NULL; tmp = NULL; - buf[0] = '\0'; - User[0] = '\0'; - PUser[0] = '\0'; - WUser[0] = '\0'; - Old_pw[0] = '\0'; - WOld_pw[0] = '\0'; - New_pw1[0] = '\0'; - New_pw2[0] = '\0'; - Action[0] = '\0'; - Msg[0] = '\0'; - command[0] = '\0'; - PwdLogFile[0] = '\0'; - strcpy(Header, msg22); + buf[0]='\0'; + User[0]='\0'; + PUser[0]='\0'; + WUser[0]='\0'; + Old_pw[0]='\0'; + WOld_pw[0]='\0'; + New_pw1[0]='\0'; + New_pw2[0]='\0'; + Action[0]='\0'; + Msg[0]='\0'; + command[0]='\0'; + PwdLogFile[0]='\0'; + strcpy(Header,msg22); - sprintf(ConfigFile, "%s\\chpasswd.conf", "c:\\squid23\\etc"); + sprintf(ConfigFile,"%s\\chpasswd.conf","c:\\squid23\\etc"); if (access(ConfigFile, R_OK) == 0) - getconf(ConfigFile, IpAuth, PwdFile, PwdMinLen, PwdMaxLen, PwdMinChar, - PwdMinNum, PwdMinSpec, PwdLogFile, ShowPwd, BgColor, TxColor, - TiColor, RuColor, Logo, Width, Height, Header, BgImage, SmtpUser, - SmtpSubject); - - if (strlen(IpAuth) > 0) { - if (access(IpAuth, R_OK) != 0) { - Hmsg(msg27); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, "-", "", "no", msg27, PwdFile, SmtpUser, - SmtpSubject); - exit(1); - } - vrfyauth(IpAuth, PwdLogFile, PwdFile, SmtpUser, SmtpSubject); + getconf(ConfigFile,IpAuth,PwdFile,PwdMinLen,PwdMaxLen,PwdMinChar,PwdMinNum,PwdMinSpec,PwdLogFile,ShowPwd,BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,SmtpUser,SmtpSubject); + + if (strlen(IpAuth) > 0 ) { + if (access(IpAuth, R_OK) != 0) { + Hmsg(msg27); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,"-","","no",msg27,PwdFile,SmtpUser,SmtpSubject); + exit(1); + } + vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject); } if (strcmp(getenv("REQUEST_METHOD"), "GET") == 0) { - UserForm(PwdMinLen, PwdMaxLen, PwdMinChar, PwdMinNum, PwdMinSpec, - BgColor, TxColor, TiColor, RuColor, Logo, Width, Height, Header, - BgImage); + UserForm(PwdMinLen,PwdMaxLen,PwdMinChar,PwdMinNum,PwdMinSpec,BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage); return; } @@ -144,79 +137,74 @@ getword(New_pw2, InputBuffer, '&'); getword(Action, InputBuffer, '='); - if (atoi(PwdMinChar) || atoi(PwdMinNum) || atoi(PwdMinSpec)) - vrfyrule(New_pw1, PwdMinChar, PwdMinNum, PwdMinSpec); + if(atoi(PwdMinChar) || atoi(PwdMinNum) || atoi(PwdMinSpec)) + vrfyrule(New_pw1,PwdMinChar,PwdMinNum,PwdMinSpec); fixpwd(Old_pw); if (strcmp(Action, "change") == 0) { - if (strlen(New_pw1) < atoi(PwdMinLen)) { - sprintf(Msg, "%s %s %s", msg02, PwdMinLen, msg03); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, PwdFile, SmtpUser, - SmtpSubject); + if (strlen(New_pw1) < atoi(PwdMinLen)) { + sprintf(Msg, "%s %s %s",msg02, PwdMinLen, msg03); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); Herror(Msg, fpw, tmp); return; - } + } if (strlen(New_pw1) > atoi(PwdMaxLen)) { - sprintf(Msg, "%s %s %s", msg04, PwdMaxLen, msg03); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, PwdFile, SmtpUser, - SmtpSubject); + sprintf(Msg, "%s %s %s",msg04, PwdMaxLen, msg03); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); Herror(Msg, fpw, tmp); return; } if (strcmp(Old_pw, New_pw1) == 0) { - sprintf(Msg, "%s", msg05); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, PwdFile, SmtpUser, - SmtpSubject); + sprintf(Msg, "%s",msg05); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); Herror(Msg, fpw, tmp); return; } if (strcmp(New_pw1, New_pw2) != 0) { - sprintf(Msg, "%s", msg06); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, PwdFile, SmtpUser, - SmtpSubject); + sprintf(Msg, "%s",msg06); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); Herror(Msg, fpw, tmp); return; } if ((fpw = fopen(PwdFile, "r")) == NULL) { - sprintf(Msg, "%s %s", msg07, PwdFile); + sprintf(Msg, "%s %s",msg07, PwdFile); Herror(Msg, fpw, tmp); return; } tn = tmpnam(NULL); if ((tmp = fopen(tn, "w")) == NULL) { - sprintf(Msg, "%s", msg08); + sprintf(Msg, "%s",msg08); Herror(Msg, fpw, tmp); return; } while (fgets(buf, MAXLEN, fpw) != NULL) { if (!ok) { - strcpy(PUser, User); - strcat(PUser, ":"); + strcpy(PUser,User); + strcat(PUser,":"); - if ((str = (char *) strstr(buf, PUser)) != (char *) NULL) { + if ((str = (char *) strstr(buf, PUser)) != (char *) NULL ) { getword(WUser, buf, ':'); getword(WOld_pw, buf, '\n'); if (strcmp(WOld_pw, crypt(Old_pw, WOld_pw)) != 0) { - sprintf(Msg, "%s %s", msg09, User); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, - PwdFile, SmtpUser, SmtpSubject); + sprintf(Msg, "%s %s",msg09, User); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); Herror(Msg, fpw, tmp); return; } - fixpwd(New_pw1); + fixpwd(New_pw1); (void) srand((int) time((time_t *) NULL)); to64(&salt[0], rand(), 2); - cpw = crypt(New_pw1, salt); + cpw = crypt(New_pw1, salt); sprintf(buf, "%s:%s\n", User, cpw); ok++; @@ -233,19 +221,16 @@ unlink(tn); if (ok) - Changed(User, PwdLogFile, New_pw1, ShowPwd, PwdFile, SmtpUser, - SmtpSubject); + Changed(User, PwdLogFile, New_pw1, ShowPwd, PwdFile, SmtpUser, SmtpSubject); else - NotFound(User, PwdLogFile, New_pw1, ShowPwd, PwdFile, SmtpUser, - SmtpSubject); + NotFound(User, PwdLogFile, New_pw1, ShowPwd, PwdFile, SmtpUser, SmtpSubject); } else { - if (strcmp(Action, "cancel") == 0) { - sprintf(Msg, "%s", msg10); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, User, New_pw1, ShowPwd, Msg, PwdFile, SmtpUser, - SmtpSubject); - Herror(Msg, fpw, tmp); - return; + if (strcmp(Action, "cancel") == 0) { + sprintf(Msg, "%s",msg10); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject); + Herror(Msg, fpw, tmp); + return; } } return; @@ -255,7 +240,8 @@ void getword(char *word, char *line, char stop) { - int x = 0, y; + int x = 0, + y; for (x = 0; ((line[x]) && (line[x] != stop)); x++) word[x] = line[x]; @@ -300,7 +286,7 @@ void putline(FILE * f, char *l) { - int x; + int x; for (x = 0; l[x]; x++) fputc(l[x], f); @@ -311,13 +297,12 @@ static unsigned char itoa64[] = /* * 0 ... 63 => ascii - 64 */ - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -void -to64(s, v, n) - register char *s; - register long v; - register int n; +void to64(s, v, n) + register char *s; + register long v; + register int n; { while (--n >= 0) { *s++ = itoa64[v & 0x3f]; @@ -327,8 +312,7 @@ void -Changed(char *user, char *PwdLogFile, char *newpwd, char *showpwd, - char *PwdFile, char *SmtpUser, char *SmtpSubject) +Changed(char *user, char *PwdLogFile, char *newpwd, char *showpwd, char *PwdFile, char *SmtpUser, char *SmtpSubject) { char Msg[MAXLEN]; @@ -336,11 +320,10 @@ puts("\n"); printf("\n"); printf(""); - sprintf(Msg, "%s %s %s", msg11, user, msg12); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, user, newpwd, showpwd, Msg, PwdFile, SmtpUser, - SmtpSubject); - strcat(Msg, ""); + sprintf(Msg, "%s %s %s",msg11, user, msg12); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,user,newpwd,showpwd,Msg,PwdFile,SmtpUser,SmtpSubject); + strcat(Msg,""); printf(Msg); return; @@ -348,8 +331,7 @@ void -NotFound(char *user, char *PwdLogFile, char *newpwd, char *showpwd, - char *PwdFile, char *SmtpUser, char *SmtpSubject) +NotFound(char *user, char *PwdLogFile, char *newpwd, char *showpwd, char *PwdFile, char *SmtpUser, char *SmtpSubject) { char Msg[MAXLEN]; @@ -357,314 +339,309 @@ puts("\n"); printf("\n"); printf(""); - sprintf(Msg, "%s %s %s", msg13, user, msg14); + sprintf(Msg, "%s %s %s",msg13, user, msg14); printf(Msg); printf("\n"); - - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, user, newpwd, showpwd, Msg, PwdFile, SmtpUser, - SmtpSubject); + + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,user,newpwd,showpwd,Msg,PwdFile,SmtpUser,SmtpSubject); return; } static void fixpwd(str) - unsigned char *str; + unsigned char *str; { - unsigned char *dest = str; + unsigned char *dest = str; - while (str[0]) { - if (str[0] == '+') - dest[0] = ' '; - else if (str[0] == '%' && hhex(str[1]) && hhex(str[2])) { - dest[0] = (unsigned char) htoi(str + 1); - str += 2; - } else - dest[0] = str[0]; + while (str[0]) + { + if (str[0] == '+') + dest[0] = ' '; + else if (str[0] == '%' && hhex(str[1]) && hhex(str[2])) + { + dest[0] = (unsigned char) htoi(str + 1); + str += 2; + } + else + dest[0] = str[0]; + + str++; + dest++; + } - str++; - dest++; - } - - dest[0] = '\0'; - return; + dest[0] = '\0'; + return; } static int htoi(s) - unsigned char *s; + unsigned char *s; { - int value; - char c; - - c = s[0]; - if (isupper(c)) - c = tolower(c); - value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16; - - c = s[1]; - if (isupper(c)) - c = tolower(c); - value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10; + int value; + char c; - return (value); + c = s[0]; + if (isupper(c)) + c = tolower(c); + value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16; + + c = s[1]; + if (isupper(c)) + c = tolower(c); + value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10; + + return (value); } -void -getconf(ConfigFile, IpAuth, PwdFile, PwdMinLen, PwdMaxLen, PwdMinChar, - PwdMinNum, PwdMinSpec, PwdLogFile, ShowPwd, BgColor, TxColor, TiColor, - RuColor, Logo, Width, Height, Header, BgImage, SmtpUser, SmtpSubject) - unsigned char *ConfigFile; - unsigned char *PwdFile; - unsigned char *IpAuth; - unsigned char *PwdLogFile; - unsigned char *ShowPwd; - unsigned char *PwdMinLen; - unsigned char *PwdMaxLen; - unsigned char *PwdMinChar; - unsigned char *PwdMinNum; - unsigned char *PwdMinSpec; - unsigned char *BgColor; - unsigned char *TxColor; - unsigned char *TiColor; - unsigned char *RuColor; - unsigned char *Logo; - unsigned char *Width; - unsigned char *Height; - unsigned char *Header; - unsigned char *BgImage; - unsigned char *SmtpUser; - unsigned char *SmtpSubject; -{ - - FILE *fp_in; - char buf[255]; - char wbuf[255]; - char Msg[255]; - char *str; - - if ((fp_in = fopen(ConfigFile, "r")) == NULL) { - sprintf(Msg, "%s %s", msg15, ConfigFile); - Hmsg(Msg); - exit(1); - } - - while (fgets(buf, MAXLEN, fp_in) != NULL) { - if ((str = (char *) strstr(buf, "#")) != (char *) NULL) - continue; - - if (strstr(buf, "password_file") != 0) { - getword(wbuf, buf, ' '); - getword(PwdFile, buf, ' '); - PwdFile[strlen(PwdFile) - 1] = '\0'; - } - - if (strstr(buf, "ip_auth") != 0) { - getword(wbuf, buf, ' '); - getword(IpAuth, buf, ' '); - IpAuth[strlen(IpAuth) - 1] = '\0'; - } - - if (strstr(buf, "minimum_length") != 0) { - getword(wbuf, buf, ' '); - getword(PwdMinLen, buf, ' '); - PwdMinLen[strlen(PwdMinLen) - 1] = '\0'; - } - - if (strstr(buf, "maximum_length") != 0) { - getword(wbuf, buf, ' '); - getword(PwdMaxLen, buf, ' '); - PwdMaxLen[strlen(PwdMaxLen) - 1] = '\0'; - } - - if (strstr(buf, "minimum_char") != 0) { - getword(wbuf, buf, ' '); - getword(PwdMinChar, buf, ' '); - PwdMinChar[strlen(PwdMinChar) - 1] = '\0'; - } - - if (strstr(buf, "minimum_num") != 0) { - getword(wbuf, buf, ' '); - getword(PwdMinNum, buf, ' '); - PwdMinNum[strlen(PwdMinNum) - 1] = '\0'; - } - - if (strstr(buf, "minimum_spec") != 0) { - getword(wbuf, buf, ' '); - getword(PwdMinSpec, buf, ' '); - PwdMinSpec[strlen(PwdMinSpec) - 1] = '\0'; - } - - if (strstr(buf, "enable_log") != 0) { - getword(wbuf, buf, ' '); - getword(PwdLogFile, buf, '\0'); - PwdLogFile[strlen(PwdLogFile) - 1] = '\0'; - } - - if (strstr(buf, "show_pwd") != 0) { - getword(wbuf, buf, ' '); - getword(ShowPwd, buf, '\0'); - ShowPwd[strlen(ShowPwd) - 1] = '\0'; - } - - if (strstr(buf, "background_color") != 0) { - getword(wbuf, buf, ' '); - getword(BgColor, buf, '\0'); - BgColor[strlen(BgColor) - 1] = '\0'; - } - - if (strstr(buf, "text_color") != 0) { - getword(wbuf, buf, ' '); - getword(TxColor, buf, '\0'); - TxColor[strlen(TxColor) - 1] = '\0'; - } - - if (strstr(buf, "title_color") != 0) { - getword(wbuf, buf, ' '); - getword(TiColor, buf, '\0'); - TiColor[strlen(TiColor) - 1] = '\0'; - } - - if (strstr(buf, "rules_color") != 0) { - getword(wbuf, buf, ' '); - getword(RuColor, buf, '\0'); - RuColor[strlen(RuColor) - 1] = '\0'; - } - - if (strstr(buf, "logo_image") != 0) { - getword(wbuf, buf, ' '); - getword(Logo, buf, '\0'); - Logo[strlen(Logo) - 1] = '\0'; - } - - if (strstr(buf, "background_image") != 0) { - getword(wbuf, buf, ' '); - getword(BgImage, buf, '\0'); - BgImage[strlen(BgImage) - 1] = '\0'; - } - - if (strstr(buf, "alert_mail_user") != 0) { - getword(wbuf, buf, ' '); - getword(SmtpUser, buf, '\0'); - SmtpUser[strlen(SmtpUser) - 1] = '\0'; - } - - if (strstr(buf, "alert_mail_subject") != 0) { - getword(wbuf, buf, '"'); - getword(SmtpSubject, buf, '"'); +void getconf(ConfigFile, IpAuth, PwdFile, PwdMinLen, PwdMaxLen, PwdMinChar, PwdMinNum, PwdMinSpec, PwdLogFile, ShowPwd, BgColor, TxColor, TiColor, RuColor, Logo, Width, Height, Header, BgImage, SmtpUser, SmtpSubject) + unsigned char *ConfigFile; + unsigned char *PwdFile; + unsigned char *IpAuth; + unsigned char *PwdLogFile; + unsigned char *ShowPwd; + unsigned char *PwdMinLen; + unsigned char *PwdMaxLen; + unsigned char *PwdMinChar; + unsigned char *PwdMinNum; + unsigned char *PwdMinSpec; + unsigned char *BgColor; + unsigned char *TxColor; + unsigned char *TiColor; + unsigned char *RuColor; + unsigned char *Logo; + unsigned char *Width; + unsigned char *Height; + unsigned char *Header; + unsigned char *BgImage; + unsigned char *SmtpUser; + unsigned char *SmtpSubject; +{ + + FILE *fp_in; + char buf[255]; + char wbuf[255]; + char Msg[255]; + char *str; + + if ((fp_in = fopen(ConfigFile, "r")) == NULL) { + sprintf(Msg, "%s %s", msg15, ConfigFile); + Hmsg(Msg); + exit(1); } - if (strstr(buf, "image_size") != 0) { - getword(wbuf, buf, ' '); - getword(Width, buf, ' '); - getword(Height, buf, '\0'); - Height[strlen(Height) - 1] = '\0'; - } + while (fgets(buf, MAXLEN, fp_in) != NULL) { + if((str=(char *) strstr(buf,"#")) != (char *) NULL) + continue; + + if(strstr(buf,"password_file") != 0) { + getword(wbuf,buf,' '); + getword(PwdFile,buf,' '); + PwdFile[strlen(PwdFile)-1]='\0'; + } + + if(strstr(buf,"ip_auth") != 0) { + getword(wbuf,buf,' '); + getword(IpAuth,buf,' '); + IpAuth[strlen(IpAuth)-1]='\0'; + } + + if(strstr(buf,"minimum_length") != 0) { + getword(wbuf,buf,' '); + getword(PwdMinLen,buf,' '); + PwdMinLen[strlen(PwdMinLen)-1]='\0'; + } + + if(strstr(buf,"maximum_length") != 0) { + getword(wbuf,buf,' '); + getword(PwdMaxLen,buf,' '); + PwdMaxLen[strlen(PwdMaxLen)-1]='\0'; + } + + if(strstr(buf,"minimum_char") != 0) { + getword(wbuf,buf,' '); + getword(PwdMinChar,buf,' '); + PwdMinChar[strlen(PwdMinChar)-1]='\0'; + } + + if(strstr(buf,"minimum_num") != 0) { + getword(wbuf,buf,' '); + getword(PwdMinNum,buf,' '); + PwdMinNum[strlen(PwdMinNum)-1]='\0'; + } + + if(strstr(buf,"minimum_spec") != 0) { + getword(wbuf,buf,' '); + getword(PwdMinSpec,buf,' '); + PwdMinSpec[strlen(PwdMinSpec)-1]='\0'; + } + + if(strstr(buf,"enable_log") != 0) { + getword(wbuf,buf,' '); + getword(PwdLogFile,buf,'\0'); + PwdLogFile[strlen(PwdLogFile)-1]='\0'; + } + + if(strstr(buf,"show_pwd") != 0) { + getword(wbuf,buf,' '); + getword(ShowPwd,buf,'\0'); + ShowPwd[strlen(ShowPwd)-1]='\0'; + } + + if(strstr(buf,"background_color") != 0) { + getword(wbuf,buf,' '); + getword(BgColor,buf,'\0'); + BgColor[strlen(BgColor)-1]='\0'; + } + + if(strstr(buf,"text_color") != 0) { + getword(wbuf,buf,' '); + getword(TxColor,buf,'\0'); + TxColor[strlen(TxColor)-1]='\0'; + } + + if(strstr(buf,"title_color") != 0) { + getword(wbuf,buf,' '); + getword(TiColor,buf,'\0'); + TiColor[strlen(TiColor)-1]='\0'; + } + + if(strstr(buf,"rules_color") != 0) { + getword(wbuf,buf,' '); + getword(RuColor,buf,'\0'); + RuColor[strlen(RuColor)-1]='\0'; + } + + if(strstr(buf,"logo_image") != 0) { + getword(wbuf,buf,' '); + getword(Logo,buf,'\0'); + Logo[strlen(Logo)-1]='\0'; + } + + if(strstr(buf,"background_image") != 0) { + getword(wbuf,buf,' '); + getword(BgImage,buf,'\0'); + BgImage[strlen(BgImage)-1]='\0'; + } + + if(strstr(buf,"alert_mail_user") != 0) { + getword(wbuf,buf,' '); + getword(SmtpUser,buf,'\0'); + SmtpUser[strlen(SmtpUser)-1]='\0'; + } + + if(strstr(buf,"alert_mail_subject") != 0) { + getword(wbuf,buf,'"'); + getword(SmtpSubject,buf,'"'); + } + + if(strstr(buf,"image_size") != 0) { + getword(wbuf,buf,' '); + getword(Width,buf,' '); + getword(Height,buf,'\0'); + Height[strlen(Height)-1]='\0'; + } + + if(strstr(buf,"header") != 0) { + getword(wbuf,buf,'"'); + getword(Header,buf,'"'); + } - if (strstr(buf, "header") != 0) { - getword(wbuf, buf, '"'); - getword(Header, buf, '"'); } - - } - - fclose(fp_in); - return; + + fclose(fp_in); + return; } -void -Log(pwdlogfile, user, newpwd, showpwd, msg, pwdfile, smtpuser, smtpsubject) - unsigned char *pwdlogfile; - unsigned char *user; - unsigned char *newpwd; - unsigned char *showpwd; - unsigned char *msg; - unsigned char *pwdfile; - unsigned char *smtpuser; - unsigned char *smtpsubject; -{ - FILE *fp_ou; - char Msg[MAXLEN]; - time_t tm; - struct tm *t; - char time_string[128]; - char pwd[MAXLEN]; - - tm = time(NULL); - t = localtime(&tm); - strftime(time_string, 127, "%Y/%m/%d %H:%M:%S", t); - - if ((fp_ou = fopen(pwdlogfile, "a")) == NULL) { - sprintf(Msg, "%s %s", msg16, pwdlogfile); - Hmsg(Msg); - exit(1); - } - - Msg[0] = '\0'; - strcpy(pwd, "-"); - - if (strcmp(showpwd, "yes") == 0) { - if (strlen(newpwd) > 0) - strcpy(pwd, newpwd); - } - - if (strlen(user) == 0) - strcpy(user, "-"); +void Log(pwdlogfile, user, newpwd, showpwd, msg, pwdfile, smtpuser, smtpsubject) + unsigned char *pwdlogfile; + unsigned char *user; + unsigned char *newpwd; + unsigned char *showpwd; + unsigned char *msg; + unsigned char *pwdfile; + unsigned char *smtpuser; + unsigned char *smtpsubject; +{ + FILE *fp_ou; + char Msg[MAXLEN]; + time_t tm; + struct tm *t; + char time_string[128]; + char pwd[MAXLEN]; + + tm = time(NULL); + t = localtime(&tm); + strftime(time_string, 127, "%Y/%m/%d %H:%M:%S", t); + + if ((fp_ou = fopen(pwdlogfile, "a")) == NULL) { + sprintf(Msg, "%s %s",msg16, pwdlogfile); + Hmsg(Msg); + exit(1); + } - sprintf(Msg, "%s %s %s %s %s pwdfile=%s\n", getenv("REMOTE_ADDR"), - time_string, user, pwd, msg, pwdfile); - Msg[strlen(Msg) - 1] = '\n'; - strip_latin(Msg); - fputs(Msg, fp_ou); - fclose(fp_ou); + Msg[0]='\0'; + strcpy(pwd,"-"); + + if(strcmp(showpwd,"yes") == 0){ + if(strlen(newpwd) > 0) + strcpy(pwd,newpwd); + } + + if(strlen(user) == 0) + strcpy(user,"-"); + + sprintf(Msg, "%s %s %s %s %s pwdfile=%s\n",getenv("REMOTE_ADDR"),time_string,user,pwd,msg,pwdfile); + Msg[strlen(Msg)-1]='\n'; + strip_latin(Msg); + fputs(Msg,fp_ou); + fclose(fp_ou); - if (strlen(smtpuser) > 0) - sendmail(smtpuser, smtpsubject, Msg); + if(strlen(smtpuser) > 0) + sendmail(smtpuser,smtpsubject,Msg); - return; + return; } -static void -vrfyrule(unsigned char *str, unsigned char *minchar, unsigned char *minnum, - unsigned char *minspec) +static void vrfyrule(unsigned char *str, unsigned char *minchar, unsigned char *minnum, unsigned char *minspec) { - int tnum = 0, talfa = 0, tspec = 0; + int tnum=0, talfa=0, tspec=0; char *ostr = str; - while (str[0]) { - if (str[0] == '%' && hhex(str[1]) && hhex(str[2])) { - tspec++; - str = str + 3; - continue; - } - if (str[0] == '.') { - tspec++; - str++; - continue; - } - if ((str[0] >= 'a' && str[0] <= 'z') || (str[0] >= 'A' - && str[0] <= 'Z')) talfa++; - if (str[0] >= '0' && str[0] <= '9') - tnum++; - - str++; + while(str[0]) { + if (str[0] == '%' && hhex(str[1]) && hhex(str[2])) { + tspec++; + str=str+3; + continue; + } + if (str[0] == '.') { + tspec++; + str++; + continue; + } + if ((str[0] >= 'a' && str[0] <= 'z') || (str[0] >='A' && str[0] <= 'Z')) + talfa++; + if (str[0] >= '0' && str[0] <= '9') + tnum++; + + str++; } - if (talfa < atoi(minchar)) - rulefail(minchar, minnum, minspec); + if(talfa < atoi(minchar)) + rulefail(minchar,minnum,minspec); - if (tnum < atoi(minnum)) - rulefail(minchar, minnum, minspec); + if(tnum < atoi(minnum)) + rulefail(minchar,minnum,minspec); - if (tspec < atoi(minspec)) - rulefail(minchar, minnum, minspec); + if(tspec < atoi(minspec)) + rulefail(minchar,minnum,minspec); return; } @@ -679,35 +656,25 @@ puts("\n"); printf("\n"); printf(""); - sprintf(Msg, "%s

", msg17); + sprintf(Msg,"%s

",msg17); printf(Msg); - sprintf(Msg, "%s

\n", msg18); + sprintf(Msg,"%s

\n",msg18); printf(Msg); - if (strcmp(minchar, "0") != 0) - printf - ("\n", - msg19, minchar); - else - printf - ("

\n", - msg19); - - if (strcmp(minnum, "0") != 0) - printf - ("\n", - msg20, minnum); - else - printf("\n", - msg20); - - if (strcmp(minspec, "0") != 0) - printf - ("\n", - msg21, minspec); - else - printf("\n", - msg21); + if(strcmp(minchar,"0") != 0) + printf("

%s
%s	%s
%s
%s	%s
%s

\n",msg19,minchar); + else + printf("

\n",msg19); + + if(strcmp(minnum,"0") != 0) + printf("\n",msg20,minnum); + else + printf("\n",msg20); + + if(strcmp(minspec,"0") != 0) + printf("\n",msg21,minspec); + else + printf("\n",msg21); printf("

%s
%s	%s
%s
%s	%s
%s

\n"); @@ -715,163 +682,153 @@ } -static void -strip_latin(char *line) +static void strip_latin(char *line) { - char buf[255]; - char warea[255]; - - while (strstr(line, "&") != 0) { - getword(warea, line, '&'); - strncat(warea, line, 1); - getword(buf, line, ';'); - strcat(warea, line); - strcpy(line, warea); - } + char buf[255]; + char warea[255]; - return; + while(strstr(line,"&") != 0){ + getword(warea,line,'&'); + strncat(warea,line,1); + getword(buf,line,';'); + strcat(warea,line); + strcpy(line,warea); + } + + return; + +} + + +static void vrfyauth(char *authfile, char *PwdLogFile, char *PwdFile, char *SmtpUser, char *SmtpSubject) +{ + + FILE *auth; + char IP[30]; + char buf[MAXLEN]; + int authbit=0; + struct stat statb; + + if(stat(authfile,&statb)) eperror(authfile); + if(statb.st_uid != 0) { + Hmsg(msg23); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,"-","","no",msg23,PwdFile,SmtpUser,SmtpSubject); + exit(1); + } + if(statb.st_mode & 022) { + Hmsg(msg24); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,"-","","no",msg24,PwdFile,SmtpUser,SmtpSubject); + exit(1); + } + + if((auth=fopen(authfile,"r"))==NULL) { + Hmsg(msg25); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,"-","","no",msg25,PwdFile,SmtpUser,SmtpSubject); + exit(1); + } + + if(getenv("HTTP_X_FORWARDED_FOR")) + sprintf(IP,"%s",getenv("HTTP_X_FORWARDED_FOR")); + else sprintf(IP,"%s",getenv("REMOTE_ADDR")); + + while(fgets(buf,MAXLEN,auth)!=NULL) { + if(!authbit) { + if(strstr(buf,"#") != 0) + continue; + else authbit=vauth(buf,IP); + } + } + + if(!authbit) { + Hmsg(msg26); + if(strlen(PwdLogFile) > 0) + Log(PwdLogFile,"-","","no",msg26,PwdFile,SmtpUser,SmtpSubject); + exit(1); + } + + return; + +} + + +int vauth(char *buf, char *ip) +{ + char a1[4],a2[4],a3[4],a4[4]; + char o1[4],o2[4],o3[4],o4[4]; + char ip2[255]; + int ok=1; + + strcpy(ip2,ip); + + buf[strlen(buf)-1]='\0'; + + if(strcmp(buf,"0.0.0.0") == 0) + return(1); + if(strcmp(buf,ip2) == 0) + return(1); + + getword(a1,buf,'.'); + getword(a2,buf,'.'); + getword(a3,buf,'.'); + getword(a4,buf,' '); + + getword(o1,ip2,'.'); + getword(o2,ip2,'.'); + getword(o3,ip2,'.'); + getword(o4,ip2,' '); + + if(strcmp(a1,"0") != 0){ + if(strcmp(a1,o1) != 0) + ok=0; + } + if(strcmp(a2,"0") != 0){ + if(strcmp(a2,o2) != 0) + ok=0; + } + if(strcmp(a3,"0") != 0){ + if(strcmp(a3,o3) != 0) + ok=0; + } + if(strcmp(a4,"0") != 0){ + if(strcmp(a4,o4) != 0) + ok=0; + } + return(ok); } -static void -vrfyauth(char *authfile, char *PwdLogFile, char *PwdFile, char *SmtpUser, - char *SmtpSubject) -{ - - FILE *auth; - char IP[30]; - char buf[MAXLEN]; - int authbit = 0; - struct stat statb; - - if (stat(authfile, &statb)) - eperror(authfile); - if (statb.st_uid != 0) { - Hmsg(msg23); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, "-", "", "no", msg23, PwdFile, SmtpUser, - SmtpSubject); - exit(1); - } - if (statb.st_mode & 022) { - Hmsg(msg24); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, "-", "", "no", msg24, PwdFile, SmtpUser, - SmtpSubject); - exit(1); - } - - if ((auth = fopen(authfile, "r")) == NULL) { - Hmsg(msg25); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, "-", "", "no", msg25, PwdFile, SmtpUser, - SmtpSubject); - exit(1); - } - - if (getenv("HTTP_X_FORWARDED_FOR")) - sprintf(IP, "%s", getenv("HTTP_X_FORWARDED_FOR")); - else - sprintf(IP, "%s", getenv("REMOTE_ADDR")); - - while (fgets(buf, MAXLEN, auth) != NULL) { - if (!authbit) { - if (strstr(buf, "#") != 0) - continue; - else - authbit = vauth(buf, IP); - } - } - - if (!authbit) { - Hmsg(msg26); - if (strlen(PwdLogFile) > 0) - Log(PwdLogFile, "-", "", "no", msg26, PwdFile, SmtpUser, - SmtpSubject); - exit(1); - } - - return; - -} - - -int -vauth(char *buf, char *ip) +eperror(s) +register char *s; { - char a1[4], a2[4], a3[4], a4[4]; - char o1[4], o2[4], o3[4], o4[4]; - char ip2[255]; - int ok = 1; - - strcpy(ip2, ip); - - buf[strlen(buf) - 1] = '\0'; - - if (strcmp(buf, "0.0.0.0") == 0) - return (1); - if (strcmp(buf, ip2) == 0) - return (1); - - getword(a1, buf, '.'); - getword(a2, buf, '.'); - getword(a3, buf, '.'); - getword(a4, buf, ' '); - - getword(o1, ip2, '.'); - getword(o2, ip2, '.'); - getword(o3, ip2, '.'); - getword(o4, ip2, ' '); - - if (strcmp(a1, "0") != 0) { - if (strcmp(a1, o1) != 0) - ok = 0; - } - if (strcmp(a2, "0") != 0) { - if (strcmp(a2, o2) != 0) - ok = 0; - } - if (strcmp(a3, "0") != 0) { - if (strcmp(a3, o3) != 0) - ok = 0; - } - if (strcmp(a4, "0") != 0) { - if (strcmp(a4, o4) != 0) - ok = 0; - } + perror("chpasswd.cgi"); + exit(1); - return (ok); } -eperror(s) - register char *s; +void sendmail(char *user, char *subj, char *msg) { - perror("chpasswd.cgi"); - exit(1); -} + FILE *mail; + char cmd[MAXLEN]; + sprintf(cmd,"mailx -s '%s' %s",subj,user); -void -sendmail(char *user, char *subj, char *msg) -{ + if (access("/bin/mailx", R_OK) == 0) + sprintf(cmd,"/bin/mailx -s '%s' %s",subj,user); + if (access("/usr/bin/mailx", R_OK) == 0) + sprintf(cmd,"/bin/mailx -s '%s' %s",subj,user); - FILE *mail; - char cmd[MAXLEN]; + if((mail =popen(cmd, "w")) != NULL ) { + fputs(msg,mail); + pclose(mail); + } - sprintf(cmd, "mailx -s '%s' %s", subj, user); - if (access("/bin/mailx", R_OK) == 0) - sprintf(cmd, "/bin/mailx -s '%s' %s", subj, user); - if (access("/usr/bin/mailx", R_OK) == 0) - sprintf(cmd, "/bin/mailx -s '%s' %s", subj, user); - - if ((mail = popen(cmd, "w")) != NULL) { - fputs(msg, mail); - pclose(mail); - } // FILE *mail = popen(MAILPROG " -s 'Test Message' root", "w"); // if (!mail) { // perror("popen"); @@ -886,5 +843,5 @@ // exit(1); // } // } - return; + return; } Index: squid/contrib/chpasswd/conf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/conf.h,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/chpasswd/conf.h 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/chpasswd/conf.h 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -1,4 +1,5 @@ #include "info.h" + #if HAVE_CRYPT_H #ifdef WIN32 #include "crypt.h" @@ -56,8 +57,7 @@ int vauth(char *, char *); void sendmail(char *, char *, char *); void to64(register char *, register long, register int); -void Log(unsigned char *, unsigned char *, unsigned char *, unsigned char *, - unsigned char *, unsigned char *, unsigned char *, unsigned char *); +void Log(unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *); Index: squid/contrib/chpasswd/language.h =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/language.h,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/chpasswd/language.h 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/chpasswd/language.h 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -16,12 +16,12 @@ #if defined(Dutch) #include "Dutch.h" #endif -#if defined(French) -#include "French.h" +#if defined(French) +#include "French.h" #endif -#if defined(German) -#include "German.h" +#if defined(German) +#include "German.h" #endif -#if defined(Spanish) -#include "Spanish.h" +#if defined(Spanish) +#include "Spanish.h" #endif Index: squid/contrib/htpasswd/htpasswd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/htpasswd/Attic/htpasswd.c,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- squid/contrib/htpasswd/htpasswd.c 27 Aug 2001 21:48:16 -0000 1.1.2.1.2.1 +++ squid/contrib/htpasswd/htpasswd.c 9 Sep 2001 10:34:28 -0000 1.1.2.1.2.2 @@ -32,72 +32,60 @@ char *tn; -char * -strd(char *s) -{ +char *strd(char *s) { char *d; - d = (char *) malloc(strlen(s) + 1); - strcpy(d, s); - return (d); + d=(char *)malloc(strlen(s) + 1); + strcpy(d,s); + return(d); } -void -getword(char *word, char *line, char stop) -{ - int x = 0, y; +void getword(char *word, char *line, char stop) { + int x = 0,y; - for (x = 0; ((line[x]) && (line[x] != stop)); x++) - word[x] = line[x]; + for(x=0;((line[x]) && (line[x] != stop));x++) + word[x] = line[x]; word[x] = '\0'; - if (line[x]) - ++x; - y = 0; + if(line[x]) ++x; + y=0; - while ((line[y++] = line[x++])); + while((line[y++] = line[x++])); } -int -getline(char *s, int n, FILE * f) -{ - register int i = 0; +int getline(char *s, int n, FILE *f) { + register int i=0; - while (1) { - s[i] = (char) fgetc(f); + while(1) { + s[i] = (char)fgetc(f); - if (s[i] == CR) - s[i] = fgetc(f); + if(s[i] == CR) + s[i] = fgetc(f); - if ((s[i] == 0x4) || (s[i] == LF) || (i == (n - 1))) { - s[i] = '\0'; - return (feof(f) ? 1 : 0); - } - ++i; + if((s[i] == 0x4) || (s[i] == LF) || (i == (n-1))) { + s[i] = '\0'; + return (feof(f) ? 1 : 0); + } + ++i; } } -void -putline(FILE * f, char *l) -{ +void putline(FILE *f,char *l) { int x; - for (x = 0; l[x]; x++) - fputc(l[x], f); - fputc('\n', f); + for(x=0;l[x];x++) fputc(l[x],f); + fputc('\n',f); } /* From local_passwd.c (C) Regents of Univ. of California blah blah */ -static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -void -to64(register char *s, register long v, register int n) -{ +void to64(register char *s, register long v, register int n) { while (--n >= 0) { - *s++ = itoa64[v & 0x3f]; - v >>= 6; + *s++ = itoa64[v&0x3f]; + v >>= 6; } } @@ -105,108 +93,102 @@ /* MPE lacks getpass() and a way to suppress stdin echo. So for now, just issue the prompt and read the results with echo. (Ugh). */ -char * -getpass(const char *prompt) -{ +char *getpass(const char *prompt) { - static char password[81]; +static char password[81]; - fputs(prompt, stderr); - gets((char *) &password); +fputs(prompt,stderr); +gets((char *)&password); - if (strlen((char *) &password) > 8) { - password[8] = '\0'; - } +if (strlen((char *)&password) > 8) { + password[8]='\0'; +} - return (char *) &password; +return (char *)&password; } #endif #ifdef WIN32 -int -get_password(char s[], int lim) +int get_password(char s[], int lim) + { - int c, i; + int c,i; - i = 0; - while (--lim > 0 && (c = getch()) != EOF && c != '\n' && c != '\r') { - if (c < ' ') { - lim++; - if (c == '\b' && i > 0) { - i--; - printf("\b \b"); - } - } else { - s[i++] = (char) c; - putchar('*'); + i=0; + while (--lim > 0 && (c = getch()) != EOF && c != '\n' && c != '\r') + { + if (c < ' ') + { + lim++; + if (c == '\b' && i > 0) + { + i--; + printf("\b \b"); + } + } + else + { + s[i++] = (char) c; + putchar('*'); + } } - } - if (c == '\r' || c == '\n') - putchar('\n'); - s[i] = '\0'; - return i; + if (c == '\r' || c == '\n') + putchar('\n'); + s[i] = '\0'; + return i; } -char * -getpass(const char *prompt) +char *getpass(const char *prompt) { - static char password[81]; + static char password[81]; - fputs(prompt, stderr); - get_password((char *) &password, 80); + fputs(prompt,stderr); + get_password((char *)&password, 80); - if (strlen((char *) &password) > 8) { - password[8] = '\0'; - } + if (strlen((char *)&password) > 8) + { + password[8]='\0'; + } - return (char *) &password; + return (char *)&password; } #endif -void -add_password(char *user, FILE * f) -{ +void add_password(char *user, FILE *f) { char *pw, *cpw, salt[3]; pw = strd((char *) getpass("New password:")); - if (strcmp(pw, (char *) getpass("Re-type new password:"))) { - fprintf(stderr, "They don't match, sorry.\n"); - if (tn) - unlink(tn); - exit(1); - } - (void) srand((int) time((time_t *) NULL)); - to64(&salt[0], rand(), 2); - cpw = crypt(pw, salt); + if(strcmp(pw,(char *) getpass("Re-type new password:"))) { + fprintf(stderr,"They don't match, sorry.\n"); + if(tn) + unlink(tn); + exit(1); + } + (void)srand((int)time((time_t *)NULL)); + to64(&salt[0],rand(),2); + cpw = crypt(pw,salt); free(pw); - fprintf(f, "%s:%s\n", user, cpw); + fprintf(f,"%s:%s\n",user,cpw); } -void -usage() -{ - fprintf(stderr, "Usage: htpasswd [-c] passwordfile username\n"); - fprintf(stderr, "The -c flag creates a new file.\n"); +void usage() { + fprintf(stderr,"Usage: htpasswd [-c] passwordfile username\n"); + fprintf(stderr,"The -c flag creates a new file.\n"); exit(1); } -void -interrupted() -{ - fprintf(stderr, "Interrupted.\n"); - if (tn) - unlink(tn); +void interrupted() { + fprintf(stderr,"Interrupted.\n"); + if(tn) unlink(tn); exit(1); } -void -main(int argc, char *argv[]) -{ - FILE *tfp, *f; +void main(int argc, char *argv[]) { + FILE *tfp,*f; char user[MAX_STRING_LEN]; char line[MAX_STRING_LEN]; char l[MAX_STRING_LEN]; @@ -215,61 +197,61 @@ int found; tn = NULL; - signal(SIGINT, (void (*)()) interrupted); - if (argc == 4) { - if (strcmp(argv[1], "-c")) - usage(); - if (!(tfp = fopen(argv[2], "w"))) { - fprintf(stderr, "Could not open passwd file %s for writing.\n", - argv[2]); - perror("fopen"); - exit(1); - } - printf("Adding password for %s.\n", argv[3]); - add_password(argv[3], tfp); - fclose(tfp); - exit(0); - } else if (argc != 3) - usage(); + signal(SIGINT,(void (*)())interrupted); + if(argc == 4) { + if(strcmp(argv[1],"-c")) + usage(); + if(!(tfp = fopen(argv[2],"w"))) { + fprintf(stderr,"Could not open passwd file %s for writing.\n", + argv[2]); + perror("fopen"); + exit(1); + } + printf("Adding password for %s.\n",argv[3]); + add_password(argv[3],tfp); + fclose(tfp); + exit(0); + } else if(argc != 3) usage(); tn = tmpnam(NULL); - if (!(tfp = fopen(tn, "w"))) { - fprintf(stderr, "Could not open temp file.\n"); - exit(1); + if(!(tfp = fopen(tn,"w"))) { + fprintf(stderr,"Could not open temp file.\n"); + exit(1); } - if (!(f = fopen(argv[1], "r"))) { - fprintf(stderr, - "Could not open passwd file %s for reading.\n", argv[1]); - fprintf(stderr, "Use -c option to create new one.\n"); - exit(1); + if(!(f = fopen(argv[1],"r"))) { + fprintf(stderr, + "Could not open passwd file %s for reading.\n",argv[1]); + fprintf(stderr,"Use -c option to create new one.\n"); + exit(1); } - strcpy(user, argv[2]); + strcpy(user,argv[2]); found = 0; - while (!(getline(line, MAX_STRING_LEN, f))) { - if (found || (line[0] == '#') || (!line[0])) { - putline(tfp, line); - continue; - } - strcpy(l, line); - getword(w, l, ':'); - if (strcmp(user, w)) { - putline(tfp, line); - continue; - } else { - printf("Changing password for user %s\n", user); - add_password(user, tfp); - found = 1; - } - } - if (!found) { - printf("Adding user %s\n", user); - add_password(user, tfp); + while(!(getline(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; + } + strcpy(l,line); + getword(w,l,':'); + if(strcmp(user,w)) { + putline(tfp,line); + continue; + } + else { + printf("Changing password for user %s\n",user); + add_password(user,tfp); + found = 1; + } + } + if(!found) { + printf("Adding user %s\n",user); + add_password(user,tfp); } fclose(f); fclose(tfp); - sprintf(command, "cmd /C copy %s %s > NUL", tn, argv[1]); + sprintf(command,"cmd /C copy %s %s > NUL",tn,argv[1]); system(command); unlink(tn); }

Uw account naam:\n"); - printf("	\n"); - printf("
Uw huidige paswoord:\n"); - printf("	\n", maxlen); - printf("
Nieuw paswoord:\n"); - printf("	\n", maxlen); - printf("
Nogmaals nieuw paswoord:\n"); - printf("	\n", maxlen); - printf("

Uw account naam:\n"); + printf("	\n"); + printf("
Uw huidige paswoord:\n"); + printf("	\n",maxlen); + printf("
Nieuw paswoord:\n"); + printf("	\n",maxlen); + printf("
Nogmaals nieuw paswoord:\n"); + printf("	\n",maxlen); + printf("

Your Account Name:\n"); - printf("	\n"); - printf("
Your Current Password:\n"); - printf("	\n", maxlen); - printf("
New Password:\n"); - printf("	\n", maxlen); - printf("
Retype New Password:\n"); - printf("	\n", maxlen); - printf("

Your Account Name:\n"); + printf("	\n"); + printf("
Your Current Password:\n"); + printf("	\n",maxlen); + printf("
New Password:\n"); + printf("	\n",maxlen); + printf("
Retype New Password:\n"); + printf("	\n",maxlen); + printf("

Votre nom d'utilisateur:\n"); - printf("	\n"); - printf("
Votre mot de passe actuel:\n"); - printf("	\n", maxlen); - printf("
Nouveau mot de passe:\n"); - printf("	\n", maxlen); - printf("
Resaisissez votre nouveau mot de passe:\n"); - printf("	\n", maxlen); - printf("

Votre nom d'utilisateur:\n"); + printf("	\n"); + printf("
Votre mot de passe actuel:\n"); + printf("	\n",maxlen); + printf("
Nouveau mot de passe:\n"); + printf("	\n",maxlen); + printf("
Resaisissez votre nouveau mot de passe:\n"); + printf("	\n",maxlen); + printf("

Benutzername:\n"); - printf("	\n"); - printf("
aktuelles Passwort:\n"); - printf("	\n"); - printf("
neues Passwort:\n"); - printf("	\n"); - printf("
neues Passwort wiederholen:\n"); - printf("	\n"); - printf("

Benutzername:\n"); + printf("	\n"); + printf("
aktuelles Passwort:\n"); + printf("	\n"); + printf("
neues Passwort:\n"); + printf("	\n"); + printf("
neues Passwort wiederholen:\n"); + printf("	\n"); + printf("

Felhaszn�l�i neved:\n"); - printf("	\n"); - printf("
Jelenlegi jelszavad:\n"); - printf("	\n", maxlen); - printf("
�j jelszavad:\n"); - printf("	\n", maxlen); - printf("
�j jelszavad meger�s�t�se:\n"); - printf("	\n", maxlen); - printf("

Felhaszn�l�i neved:\n"); + printf("	\n"); + printf("
Jelenlegi jelszavad:\n"); + printf("	\n",maxlen); + printf("
�j jelszavad:\n"); + printf("	\n",maxlen); + printf("
�j jelszavad meger�s�t�se:\n"); + printf("	\n",maxlen); + printf("

Il tuo Account:\n"); - printf("	\n"); - printf("
La tua Password attuale:\n"); - printf("	\n", maxlen); - printf("
La nuova Password:\n"); - printf("	\n", maxlen); - printf("
Riscrivi la nuova Password:\n"); - printf("	\n", maxlen); - printf("

Il tuo Account:\n"); + printf("	\n"); + printf("
La tua Password attuale:\n"); + printf("	\n",maxlen); + printf("
La nuova Password:\n"); + printf("	\n",maxlen); + printf("
Riscrivi la nuova Password:\n"); + printf("	\n",maxlen); + printf("

Usuário: \n"); - printf("	\n"); - printf("
Senha atual:\n"); - printf("	\n"); - printf("
Nova senha:\n"); - printf("	\n"); - printf("
Reentre a nova senha:\n"); - printf("	\n"); - printf("

Usuário: \n"); + printf("	\n"); + printf("
Senha atual:\n"); + printf("	\n"); + printf("
Nova senha:\n"); + printf("	\n"); + printf("
Reentre a nova senha:\n"); + printf("	\n"); + printf("

�� \n"); - printf("	\n"); - printf("
�� :\n"); - printf("	\n", maxlen); - printf("
�� :\n"); - printf("	\n", maxlen); - printf("
�� :\n"); - printf("	\n", maxlen); - printf("

�� \n"); + printf("	\n"); + printf("
�� :\n"); + printf("	\n",maxlen); + printf("
�� :\n"); + printf("	\n",maxlen); + printf("
�� :\n"); + printf("	\n",maxlen); + printf("

Cuenta de acceso a Internet:\n"); - printf("	\n"); - printf("
Su contraseña actual:\n"); - printf("	\n", maxlen); - printf("
Su nueva contraseña:\n"); - printf("	\n", maxlen); - printf("
Reescriba su nueva contraseña:\n"); - printf("	\n", maxlen); - printf("

Cuenta de acceso a Internet:\n"); + printf("	\n"); + printf("
Su contraseña actual:\n"); + printf("	\n",maxlen); + printf("
Su nueva contraseña:\n"); + printf("	\n",maxlen); + printf("
Reescriba su nueva contraseña:\n"); + printf("	\n",maxlen); + printf("