compile-0.96.9.patch
author "Tomas Zeman <tzeman@volny.cz>"
Sun, 20 Jan 2008 01:58:36 +0100
changeset 1 c3f2c8485f70
parent 0 string_h-fix.patch@83679af57302
permissions -rw-r--r--
string_h-fix.patch -> compile-0.96.9.patch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     1
string.h fix
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     2
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     3
diff -r 6f7a81934006 authenticate/Makefile.in
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     4
--- a/authenticate/Makefile.in	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     5
+++ b/authenticate/Makefile.in	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     6
@@ -93,7 +93,7 @@ CLEANFILES = $(man_MANS) $(noinst_HTMLS)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     7
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     8
 EXTRA_DIST = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
     9
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    10
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    11
+CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    12
 INCLUDES = $(CIINCLUDES) -I../lib
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    13
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    14
 checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    15
diff -r 6f7a81934006 authenticate/authvmailmgr.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    16
--- a/authenticate/authvmailmgr.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    17
+++ b/authenticate/authvmailmgr.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    18
@@ -15,6 +15,8 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    19
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    20
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    21
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    22
+#include <stdlib.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    23
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    24
 #include "misc/exec.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    25
 #include "authvlib.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    26
 // Courier-IMAP includes
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    27
diff -r 6f7a81934006 authenticate/checkvpw.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    28
--- a/authenticate/checkvpw.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    29
+++ b/authenticate/checkvpw.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    30
@@ -16,6 +16,7 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    31
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    32
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    33
 #include <errno.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    34
+#include <stdlib.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    35
 #include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    36
 #include <sys/types.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    37
 #include "config/configrc.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    38
diff -r 6f7a81934006 authenticate/vauthenticate.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    39
--- a/authenticate/vauthenticate.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    40
+++ b/authenticate/vauthenticate.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    41
@@ -16,6 +16,7 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    42
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    43
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    44
 #include <errno.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    45
+#include <stdlib.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    46
 #include <unistd.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    47
 #include "authvlib.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    48
 #include "fdbuf/fdbuf.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    49
diff -r 6f7a81934006 cgi/Makefile.in
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    50
--- a/cgi/Makefile.in	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    51
+++ b/cgi/Makefile.in	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    52
@@ -86,7 +86,7 @@ cgi_PROGRAMS = vpasswd vadduser vdeluser
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    53
 cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards 	listvdomain
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    54
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    55
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    56
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    57
+CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    58
 INCLUDES = -I../lib
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    59
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    60
 vpasswd_SOURCES = vpasswd.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    61
diff -r 6f7a81934006 commands/Makefile.in
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    62
--- a/commands/Makefile.in	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    63
+++ b/commands/Makefile.in	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    64
@@ -99,7 +99,7 @@ EXTRA_PROGRAMS = vpasswd2cdb vrehash
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    65
 EXTRA_PROGRAMS = vpasswd2cdb vrehash
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    66
 EXTRA_SCRIPTS = allvpasswd2cdb
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    67
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    68
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    69
+CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    70
 INCLUDES = -I../lib -DBINDIR=\"@bindir@\"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    71
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    72
 listvdomain_SOURCES = listvdomain.cc vcommand.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    73
diff -r 6f7a81934006 commands/vcheckquota.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    74
--- a/commands/vcheckquota.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    75
+++ b/commands/vcheckquota.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    76
@@ -31,10 +31,10 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    77
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    78
 const char* cli_program = "vcheckquota";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    79
 const char* cli_help_prefix = "vmailmgr quota enforcement program\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    80
-const char* cli_help_suffix = "
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    81
-Warning: the soft-message is linked into the users maildir once for each
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    82
-message that is received while the account is over its soft quota.  This may
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    83
-result in multiple warning messages.\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    84
+const char* cli_help_suffix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    85
+"Warning: the soft-message is linked into the users maildir once for each"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    86
+"message that is received while the account is over its soft quota.  This may"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    87
+"result in multiple warning messages.\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    88
 const char* cli_args_usage = "";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    89
 const int cli_args_min = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    90
 const int cli_args_max = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    91
diff -r 6f7a81934006 commands/vchforwards.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    92
--- a/commands/vchforwards.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    93
+++ b/commands/vchforwards.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    94
@@ -25,8 +25,7 @@ const char* cli_help_prefix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    95
 const char* cli_help_prefix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    96
 "Change virtual user forwarding addresses.\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    97
 const char* cli_help_suffix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    98
-"If no forwarding addresses are given, forwarding is disabled.
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
    99
-";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   100
+"If no forwarding addresses are given, forwarding is disabled.";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   101
 const char* cli_args_usage = "USERNAME [DESTINATION1 ...]";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   102
 const int cli_args_min = 1;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   103
 const int cli_args_max = -1;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   104
diff -r 6f7a81934006 commands/vpasswd2cdb.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   105
--- a/commands/vpasswd2cdb.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   106
+++ b/commands/vpasswd2cdb.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   107
@@ -27,9 +27,9 @@ const char* cli_program = "vpasswd2cdb";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   108
 const char* cli_program = "vpasswd2cdb";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   109
 const char* cli_help_prefix = "Converts text password tables to CDB format\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   110
 const char* cli_help_suffix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   111
-"Reads in a standard virtual password table in the current directory,
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   112
-and writes it out to a CDB table.  The file names for the text and CDB
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   113
-tables are determined from the configuration file.";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   114
+"Reads in a standard virtual password table in the current directory,"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   115
+"and writes it out to a CDB table.  The file names for the text and CDB"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   116
+"tables are determined from the configuration file.";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   117
 const char* cli_args_usage = "";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   118
 const int cli_args_min = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   119
 const int cli_args_max = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   120
diff -r 6f7a81934006 commands/vpasswd2db.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   121
--- a/commands/vpasswd2db.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   122
+++ b/commands/vpasswd2db.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   123
@@ -26,9 +26,9 @@ const char* cli_program = "vpasswd2db";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   124
 const char* cli_program = "vpasswd2db";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   125
 const char* cli_help_prefix = "Converts text password tables to current vpwtable DB format\n";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   126
 const char* cli_help_suffix =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   127
-"Reads in a standard virtual password table in the current directory,
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   128
-and writes it out to a table.  The file names for the input and output
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   129
-tables are determined from the configuration file.";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   130
+"Reads in a standard virtual password table in the current directory,"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   131
+"and writes it out to a table.  The file names for the input and output"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   132
+"tables are determined from the configuration file.";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   133
 const char* cli_args_usage = "";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   134
 const int cli_args_min = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   135
 const int cli_args_max = 0;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   136
diff -r 6f7a81934006 daemon/Makefile.in
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   137
--- a/daemon/Makefile.in	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   138
+++ b/daemon/Makefile.in	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   139
@@ -91,7 +91,7 @@ CLEANFILES = $(man_MANS) $(noinst_HTMLS)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   140
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   141
 EXTRA_DIST = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   142
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   143
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   144
+CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   145
 INCLUDES = -I../lib
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   146
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   147
 vmailmgrd_SOURCES = daemon.h 	adduser2.cc 	autoresponse.cc 	chattr.cc 	check.cc 	command.h command.cc 	deluser.cc 	dispatch.cc 	listdomain.cc 	log.h log.cc 	lookup.cc 	main.cc 	state.h state.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   148
diff -r 6f7a81934006 lib/courier-authlib/changeuidgid.c
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   149
--- a/lib/courier-authlib/changeuidgid.c	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   150
+++ b/lib/courier-authlib/changeuidgid.c	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   151
@@ -12,6 +12,7 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   152
 #endif
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   153
 #include	<stdio.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   154
 #include	<stdlib.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   155
+#include	<string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   156
 #include	<grp.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   157
 #include	<pwd.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   158
 #include	<errno.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   159
diff -r 6f7a81934006 lib/misc/crc32.h
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   160
--- a/lib/misc/crc32.h	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   161
+++ b/lib/misc/crc32.h	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   162
@@ -45,4 +45,4 @@ public:
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   163
         (unsigned char)(octet) ] ^ ( ((crc32)>>8) & 0x00FFFFFFL ) )
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   164
 #endif
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   165
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   166
-#endif CRC32INIT
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   167
+#endif /* CRC32INIT */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   168
diff -r 6f7a81934006 lib/misc/exec.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   169
--- a/lib/misc/exec.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   170
+++ b/lib/misc/exec.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   171
@@ -17,10 +17,12 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   172
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   173
 #include <errno.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   174
 #include <stdlib.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   175
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   176
 #include <sys/stat.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   177
 #include <sys/types.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   178
 #include <sys/wait.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   179
 #include <unistd.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   180
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   181
 #include "exec.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   182
 #include "config/configrc.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   183
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   184
diff -r 6f7a81934006 lib/misc/keystrlist.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   185
--- a/lib/misc/keystrlist.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   186
+++ b/lib/misc/keystrlist.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   187
@@ -15,6 +15,7 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   188
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   189
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   190
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   191
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   192
 #include "strlist.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   193
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   194
 void keystrlist::set(const mystring& var, const mystring& val)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   195
diff -r 6f7a81934006 lib/misc/md5-crypt.c
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   196
--- a/lib/misc/md5-crypt.c	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   197
+++ b/lib/misc/md5-crypt.c	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   198
@@ -32,7 +32,7 @@ static const char md5_salt_prefix[] = "$
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   199
 static const char md5_salt_prefix[] = "$1$";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   200
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   201
 /* Table with characters for base64 transformation.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   202
-static const char b64t[64] =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   203
+static const char b64t[] =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   204
 "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   205
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   206
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   207
@@ -53,11 +53,7 @@ extern char *md5_crypt __P ((const char 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   208
 /* This entry point is equivalent to the `crypt' function in Unix
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   209
    libcs.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   210
 char *
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   211
-md5_crypt_r (key, salt, buffer, buflen)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   212
-     const char *key;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   213
-     const char *salt;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   214
-     char *buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   215
-     int buflen;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   216
+md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   217
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   218
   unsigned char alt_result[16];
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   219
   struct md5_ctx ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   220
@@ -213,9 +209,7 @@ md5_crypt_r (key, salt, buffer, buflen)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   221
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   222
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   223
 char *
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   224
-md5_crypt (key, salt)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   225
-     const char *key;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   226
-     const char *salt;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   227
+md5_crypt (const char *key, const char *salt)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   228
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   229
   /* We don't want to have an arbitrary limit in the size of the
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   230
      password.  We can compute the size of the result in advance and
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   231
@@ -227,7 +221,7 @@ md5_crypt (key, salt)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   232
   if (buflen < needed)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   233
     {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   234
       buflen = needed;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   235
-      if ((buffer = realloc (buffer, buflen)) == NULL)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   236
+      if ((buffer = (char *)realloc (buffer, buflen)) == NULL)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   237
 	return NULL;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   238
     }
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   239
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   240
diff -r 6f7a81934006 lib/misc/md5.c
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   241
--- a/lib/misc/md5.c	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   242
+++ b/lib/misc/md5.c	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   243
@@ -69,8 +69,7 @@ static const unsigned char fillbuf[64] =
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   244
 /* Initialize structure containing state of computation.
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   245
    (RFC 1321, 3.3: Step 3)  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   246
 void
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   247
-md5_init_ctx (ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   248
-     struct md5_ctx *ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   249
+md5_init_ctx (struct md5_ctx *ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   250
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   251
   ctx->A = 0x67452301;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   252
   ctx->B = 0xefcdab89;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   253
@@ -87,9 +86,7 @@ md5_init_ctx (ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   254
    IMPORTANT: On some systems it is required that RESBUF is correctly
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   255
    aligned for a 32 bits value.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   256
 void *
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   257
-md5_read_ctx (ctx, resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   258
-     const struct md5_ctx *ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   259
-     void *resbuf;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   260
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   261
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   262
   ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   263
   ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   264
@@ -105,9 +102,7 @@ md5_read_ctx (ctx, resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   265
    IMPORTANT: On some systems it is required that RESBUF is correctly
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   266
    aligned for a 32 bits value.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   267
 void *
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   268
-md5_finish_ctx (ctx, resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   269
-     struct md5_ctx *ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   270
-     void *resbuf;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   271
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   272
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   273
   /* Take yet unprocessed bytes into account.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   274
   md5_uint32 bytes = ctx->buflen;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   275
@@ -136,9 +131,7 @@ md5_finish_ctx (ctx, resbuf)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   276
    resulting message digest number will be written into the 16 bytes
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   277
    beginning at RESBLOCK.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   278
 int
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   279
-md5_stream (stream, resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   280
-     FILE *stream;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   281
-     void *resblock;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   282
+md5_stream (FILE *stream, void *resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   283
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   284
   /* Important: BLOCKSIZE must be a multiple of 64.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   285
 #define BLOCKSIZE 4096
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   286
@@ -193,10 +186,7 @@ md5_stream (stream, resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   287
    output yields to the wanted ASCII representation of the message
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   288
    digest.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   289
 void *
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   290
-md5_buffer (buffer, len, resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   291
-     const char *buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   292
-     size_t len;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   293
-     void *resblock;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   294
+md5_buffer (const char *buffer, size_t len, void *resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   295
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   296
   struct md5_ctx ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   297
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   298
@@ -212,10 +202,7 @@ md5_buffer (buffer, len, resblock)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   299
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   300
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   301
 void
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   302
-md5_process_bytes (buffer, len, ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   303
-     const void *buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   304
-     size_t len;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   305
-     struct md5_ctx *ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   306
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   307
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   308
   /* When we already have some bits in our internal buffer concatenate
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   309
      both inputs first.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   310
@@ -270,13 +257,10 @@ md5_process_bytes (buffer, len, ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   311
    It is assumed that LEN % 64 == 0.  */
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   312
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   313
 void
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   314
-md5_process_block (buffer, len, ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   315
-     const void *buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   316
-     size_t len;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   317
-     struct md5_ctx *ctx;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   318
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   319
 {
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   320
   md5_uint32 correct_words[16];
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   321
-  const md5_uint32 *words = buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   322
+  const md5_uint32 *words = (const md5_uint32 *)buffer;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   323
   size_t nwords = len / sizeof (md5_uint32);
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   324
   const md5_uint32 *endp = words + nwords;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   325
   md5_uint32 A = ctx->A;
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   326
diff -r 6f7a81934006 lib/misc/strlist.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   327
--- a/lib/misc/strlist.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   328
+++ b/lib/misc/strlist.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   329
@@ -15,6 +15,7 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   330
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   331
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   332
 #include <config.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   333
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   334
 #include "strlist.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   335
 
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   336
 static const char* compare(const char* ptr, const char* end,
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   337
diff -r 6f7a81934006 lib/mystring/append.cc
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   338
--- a/lib/mystring/append.cc	Wed Jan 16 22:39:43 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   339
+++ b/lib/mystring/append.cc	Sun Jan 20 01:57:01 2008 +0100
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   340
@@ -1,3 +1,4 @@
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   341
+#include <string.h>
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   342
 #include "mystring.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   343
 #include "trace.h"
83679af57302 string_h-fix: fix compilation
"Tomas Zeman <tzeman@volny.cz>"
parents:
diff changeset
   344