Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11123/src
Modified Files:
gaimrc.c
Log Message:
Can now have reserved chars in IM and proxy passwords. (Ref: bug I.D.
[ 555752 ] Proxy pass socks and } character)
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- gaimrc.c 4 May 2002 08:21:31 -0000 1.95
+++ gaimrc.c 15 Jun 2002 15:43:03 -0000 1.96
@@ -555,10 +555,13 @@
{
char *c;
int nl = 1, i;
- if (u->options & OPT_USR_REM_PASS)
- fprintf(f, "\t\tident { %s } { %s }\n", u->username, u->password);
- else
+
+ if (u->options & OPT_USR_REM_PASS) {
+ fprintf(f, "\t\tident { %s } { %s }\n", u->username, (c = escape_text2(u->password)));
+ free(c);
+ } else {
fprintf(f, "\t\tident { %s } { }\n", u->username);
+ }
fprintf(f, "\t\tuser_info {");
c = u->user_info;
while (*c) {
@@ -972,12 +975,15 @@
static void gaimrc_write_proxy(FILE *f)
{
+ char *str;
+
fprintf(f, "proxy {\n");
fprintf(f, "\thost { %s }\n", proxyhost);
fprintf(f, "\tport { %d }\n", proxyport);
fprintf(f, "\ttype { %d }\n", proxytype);
fprintf(f, "\tuser { %s }\n", proxyuser);
- fprintf(f, "\tpass { %s }\n", proxypass);
+ fprintf(f, "\tpass { %s }\n", (str = escape_text2(proxypass)));
+ free(str);
fprintf(f, "}\n");
}
|
