Changeset b73ac9c for storage_text.c

Timestamp:

2005-12-13T23:05:27Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

d3307e2

Parents:

a301379c

Message:

Add support for 'primary' and 'migrate' account storages.
Fix two bugs in the text storage backend that were introduced by my previous
changes.

File:

• storage_text.c (modified) (6 diffs)

storage_text.c

@@ -67 +67 @@
         {
                 fgetc( fp );
-                line = deobfucrypt( irc, s );
+                line = deobfucrypt( s, password );
+                if (line == NULL) return STORAGE_OTHER_ERROR;
                 root_command_string( irc, ru, line, 0 );
                 g_free( line );
@@ -129 +130 @@
         \*/
         
-        hash = hashpass( irc );
+        hash = hashpass( irc->password );
         if( hash == NULL )
         {
                 irc_usermsg( irc, "Please register yourself if you want to save your settings." );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
         
@@ -192 +193 @@
                                     proto_name[a->protocol], a->user, a->pass, a->server ? a->server : "" );
                 
-                line = obfucrypt( irc, s );
+                line = obfucrypt( s, irc->password );
                 if( *line )
                 {
@@ -210 +211 @@
                 {
                         g_snprintf( s, sizeof( s ), "set %s \"%s\"", set->key, set->value );
-                        line = obfucrypt( irc, s );
+                        line = obfucrypt( s, irc->password );
                         if( *line )
                         {
@@ -227 +228 @@
         {
                 g_snprintf( s, sizeof( s ), "rename %s %s", ROOT_NICK, irc->mynick );
-                line = obfucrypt( irc, s );
+                line = obfucrypt( s, irc->password );
                 if( *line )
                 {
@@ -270 +271 @@
         FILE *fp;
         
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".nicks" );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".accounts" );
         fp = fopen( s, "r" );
         if (!fp)