Fix some build errors.

diff --git a/congestion.diff b/congestion.diff
index a30691dc09dd8e071063e31a5ec43045702edfe4..098f596a7cc9ac7ce4a50ddea602a2452f4363f4 100644 (file)
--- a/congestion.diff
+++ b/congestion.diff
@@ -39,7 +39,15 @@ diff --git a/loadparm.c b/loadparm.c
        char *dont_compress;
        char *exclude;
        char *exclude_from;
-@@ -172,6 +173,7 @@ typedef struct {
+@@ -148,6 +149,7 @@ typedef struct {
+       BOOL auth_users_EXP;
+       BOOL charset_EXP;
+       BOOL comment_EXP;
++      BOOL congestion_alg_EXP;
+       BOOL dont_compress_EXP;
+       BOOL exclude_EXP;
+       BOOL exclude_from_EXP;
+@@ -172,6 +174,7 @@ typedef struct {
        BOOL temp_dir_EXP;
        BOOL uid_EXP;
  
@@ -47,7 +55,7 @@ diff --git a/loadparm.c b/loadparm.c
        int max_connections;
        int max_verbosity;
        int syslog_facility;
-@@ -234,6 +236,7 @@ static const all_vars Defaults = {
+@@ -234,6 +237,7 @@ static const all_vars Defaults = {
   /* auth_users; */            NULL,
   /* charset; */               NULL,
   /* comment; */               NULL,
@@ -55,7 +63,15 @@ diff --git a/loadparm.c b/loadparm.c
   /* dont_compress; */         DEFAULT_DONT_COMPRESS,
   /* exclude; */                       NULL,
   /* exclude_from; */          NULL,
-@@ -285,6 +288,7 @@ static const all_vars Defaults = {
+@@ -261,6 +265,7 @@ static const all_vars Defaults = {
+  /* auth_users_EXP; */                False,
+  /* charset_EXP; */           False,
+  /* comment_EXP; */           False,
++ /* congestion_alg_EXP; */    False,
+  /* dont_compress_EXP; */     False,
+  /* exclude_EXP; */           False,
+  /* exclude_from_EXP; */      False,
+@@ -285,6 +290,7 @@ static const all_vars Defaults = {
   /* temp_dir_EXP; */          False,
   /* uid_EXP; */                       False,
  
@@ -63,7 +79,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* max_connections; */               0,
   /* max_verbosity; */         1,
   /* syslog_facility; */               LOG_DAEMON,
-@@ -402,6 +406,8 @@ static struct parm_struct parm_table[] =
+@@ -402,6 +408,8 @@ static struct parm_struct parm_table[] =
   {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
   {"charset",           P_STRING, P_LOCAL, &Vars.l.charset,             NULL,0},
   {"comment",           P_STRING, P_LOCAL, &Vars.l.comment,             NULL,0},
@@ -72,7 +88,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
   {"exclude from",      P_STRING, P_LOCAL, &Vars.l.exclude_from,        NULL,0},
   {"exclude",           P_STRING, P_LOCAL, &Vars.l.exclude,             NULL,0},
-@@ -541,6 +547,7 @@ FN_GLOBAL_INTEGER(lp_rsync_port, rsync_port)
+@@ -541,6 +549,7 @@ FN_GLOBAL_INTEGER(lp_rsync_port, rsync_port)
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_charset, charset)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -80,7 +96,7 @@ diff --git a/loadparm.c b/loadparm.c
  FN_LOCAL_STRING(lp_dont_compress, dont_compress)
  FN_LOCAL_STRING(lp_exclude, exclude)
  FN_LOCAL_STRING(lp_exclude_from, exclude_from)
-@@ -565,6 +572,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
+@@ -565,6 +574,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
  FN_LOCAL_STRING(lp_uid, uid)
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 5340e79b35e264fc60627f6e97be1976cb59c634..a299f3787b2f5fc4b9a3261e8b07c6f006e50ae6 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -217,7 +217,15 @@ diff --git a/loadparm.c b/loadparm.c
        char *lock_file;
        char *log_file;
        char *log_format;
-@@ -244,6 +245,7 @@ static const all_vars Defaults = {
+@@ -158,6 +159,7 @@ typedef struct {
+       BOOL include_EXP;
+       BOOL include_from_EXP;
+       BOOL incoming_chmod_EXP;
++      BOOL link_by_hash_dir_EXP;
+       BOOL lock_file_EXP;
+       BOOL log_file_EXP;
+       BOOL log_format_EXP;
+@@ -244,6 +246,7 @@ static const all_vars Defaults = {
   /* include; */                       NULL,
   /* include_from; */          NULL,
   /* incoming_chmod; */                NULL,
@@ -225,7 +233,15 @@ diff --git a/loadparm.c b/loadparm.c
   /* lock_file; */             DEFAULT_LOCK_FILE,
   /* log_file; */              NULL,
   /* log_format; */            "%o %h [%a] %m (%u) %f %l",
-@@ -416,6 +418,7 @@ static struct parm_struct parm_table[] =
+@@ -271,6 +274,7 @@ static const all_vars Defaults = {
+  /* include_EXP; */           False,
+  /* include_from_EXP; */      False,
+  /* incoming_chmod_EXP; */    False,
++ /* link_by_hash_dir_EXP; */  False,
+  /* lock_file_EXP; */         False,
+  /* log_file_EXP; */          False,
+  /* log_format_EXP; */                False,
+@@ -416,6 +420,7 @@ static struct parm_struct parm_table[] =
   {"include from",      P_STRING, P_LOCAL, &Vars.l.include_from,        NULL,0},
   {"include",           P_STRING, P_LOCAL, &Vars.l.include,             NULL,0},
   {"incoming chmod",    P_STRING, P_LOCAL, &Vars.l.incoming_chmod,      NULL,0},
@@ -233,7 +249,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"list",              P_BOOL,   P_LOCAL, &Vars.l.list,                NULL,0},
   {"lock file",         P_STRING, P_LOCAL, &Vars.l.lock_file,           NULL,0},
   {"log file",          P_STRING, P_LOCAL, &Vars.l.log_file,            NULL,0},
-@@ -551,6 +554,7 @@ FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
+@@ -551,6 +556,7 @@ FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
  FN_LOCAL_STRING(lp_include, include)
  FN_LOCAL_STRING(lp_include_from, include_from)
  FN_LOCAL_STRING(lp_incoming_chmod, incoming_chmod)

diff --git a/nameconverter.diff b/nameconverter.diff
index b15def4dd077e7a7ba5f4c8e5b872a6883ed3aac..30cae7363929746b00fca773eb96a8395e876a91 100644 (file)
--- a/nameconverter.diff
+++ b/nameconverter.diff
@@ -189,7 +189,15 @@ diff --git a/loadparm.c b/loadparm.c
        char *outgoing_chmod;
        char *path;
        char *postxfer_exec;
-@@ -248,6 +249,7 @@ static const all_vars Defaults = {
+@@ -162,6 +163,7 @@ typedef struct {
+       BOOL log_file_EXP;
+       BOOL log_format_EXP;
+       BOOL name_EXP;
++      BOOL name_converter_EXP;
+       BOOL outgoing_chmod_EXP;
+       BOOL path_EXP;
+       BOOL postxfer_exec_EXP;
+@@ -248,6 +250,7 @@ static const all_vars Defaults = {
   /* log_file; */              NULL,
   /* log_format; */            "%o %h [%a] %m (%u) %f %l",
   /* name; */                  NULL,
@@ -197,7 +205,15 @@ diff --git a/loadparm.c b/loadparm.c
   /* outgoing_chmod; */                NULL,
   /* path; */                  NULL,
   /* postxfer_exec; */         NULL,
-@@ -424,6 +426,7 @@ static struct parm_struct parm_table[] =
+@@ -275,6 +278,7 @@ static const all_vars Defaults = {
+  /* log_file_EXP; */          False,
+  /* log_format_EXP; */                False,
+  /* name_EXP; */              False,
++ /* name_converter_EXP; */    False,
+  /* outgoing_chmod_EXP; */    False,
+  /* path_EXP; */              False,
+  /* postxfer_exec_EXP; */     False,
+@@ -424,6 +428,7 @@ static struct parm_struct parm_table[] =
   {"max verbosity",     P_INTEGER,P_LOCAL, &Vars.l.max_verbosity,       NULL,0},
   {"munge symlinks",    P_BOOL,   P_LOCAL, &Vars.l.munge_symlinks,      NULL,0},
   {"name",              P_STRING, P_LOCAL, &Vars.l.name,                NULL,0},
@@ -205,7 +221,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"numeric ids",       P_BOOL,   P_LOCAL, &Vars.l.numeric_ids,         NULL,0},
   {"outgoing chmod",    P_STRING, P_LOCAL, &Vars.l.outgoing_chmod,      NULL,0},
   {"path",              P_PATH,   P_LOCAL, &Vars.l.path,                NULL,0},
-@@ -559,6 +562,7 @@ FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
+@@ -559,6 +564,7 @@ FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
  FN_LOCAL_STRING(lp_path, path)
  FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec)
  FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)