Fixed failing hunks.

[rsync/rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 61d25fa..e872e6c 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -57,7 +57,7 @@ See the newly-created file "instructions" for more info.
  
  #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -638,6 +641,9 @@ static int rsync_module(int f_in, int f_
+@@ -642,6 +645,9 @@ static int rsync_module(int f_in, int f_
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
@@ -69,7 +69,7 @@ See the newly-created file "instructions" for more info.
                                am_sender ? "on" : "to",
 --- old/configure.in
 +++ new/configure.in
-@@ -642,6 +642,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -643,6 +643,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -915,7 +915,7 @@ See the newly-created file "instructions" for more info.
        char *filter;
        char *gid;
        char *hosts_allow;
-@@ -141,14 +148,20 @@ typedef struct
+@@ -141,15 +148,21 @@ typedef struct
        char *prexfer_exec;
        char *refuse_options;
        char *secrets_file;
@@ -932,11 +932,12 @@ See the newly-created file "instructions" for more info.
        int timeout;
  
 +      BOOL database_logging;
+       BOOL fake_super;
 +      BOOL get_custom_id_before_insert;
        BOOL ignore_errors;
        BOOL ignore_nonreadable;
        BOOL list;
-@@ -168,9 +181,16 @@ static service sDefault =
+@@ -169,9 +182,16 @@ static service sDefault =
  {
   /* auth_users; */            NULL,
   /* comment; */                       NULL,
@@ -953,7 +954,7 @@ See the newly-created file "instructions" for more info.
   /* filter; */                        NULL,
   /* gid; */                   NOBODY_GROUP,
   /* hosts_allow; */           NULL,
-@@ -188,14 +208,20 @@ static service sDefault =
+@@ -189,15 +209,21 @@ static service sDefault =
   /* prexfer_exec; */          NULL,
   /* refuse_options; */                NULL,
   /* secrets_file; */          NULL,
@@ -970,11 +971,12 @@ See the newly-created file "instructions" for more info.
   /* timeout; */                       0,
  
 + /* database_logging; */      False,
+  /* fake_super; */            False,
 + /* get_custom_id_before_insert; */ True,
   /* ignore_errors; */         False,
   /* ignore_nonreadable; */    False,
   /* list; */                  True,
-@@ -294,10 +320,19 @@ static struct parm_struct parm_table[] =
+@@ -296,11 +322,20 @@ static struct parm_struct parm_table[] =
  
   {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
   {"comment",           P_STRING, P_LOCAL, &sDefault.comment,           NULL,0},
@@ -989,12 +991,13 @@ See the newly-created file "instructions" for more info.
   {"exclude from",      P_STRING, P_LOCAL, &sDefault.exclude_from,      NULL,0},
   {"exclude",           P_STRING, P_LOCAL, &sDefault.exclude,           NULL,0},
 + {"exit table name",   P_STRING, P_LOCAL, &sDefault.exit_table_name,   NULL,0},
+  {"fake super",        P_BOOL,   P_LOCAL, &sDefault.fake_super,        NULL,0},
   {"filter",            P_STRING, P_LOCAL, &sDefault.filter,            NULL,0},
 + {"get custom id before insert",P_BOOL,P_LOCAL,&sDefault.get_custom_id_before_insert,NULL,0},
   {"gid",               P_STRING, P_LOCAL, &sDefault.gid,               NULL,0},
   {"hosts allow",       P_STRING, P_LOCAL, &sDefault.hosts_allow,       NULL,0},
   {"hosts deny",        P_STRING, P_LOCAL, &sDefault.hosts_deny,        NULL,0},
-@@ -322,12 +357,16 @@ static struct parm_struct parm_table[] =
+@@ -325,12 +360,16 @@ static struct parm_struct parm_table[] =
   {"read only",         P_BOOL,   P_LOCAL, &sDefault.read_only,         NULL,0},
   {"refuse options",    P_STRING, P_LOCAL, &sDefault.refuse_options,    NULL,0},
   {"secrets file",      P_STRING, P_LOCAL, &sDefault.secrets_file,      NULL,0},
@@ -1011,7 +1014,7 @@ See the newly-created file "instructions" for more info.
   {"use chroot",        P_BOOL,   P_LOCAL, &sDefault.use_chroot,        NULL,0},
   {"write only",        P_BOOL,   P_LOCAL, &sDefault.write_only,        NULL,0},
   {NULL,                P_BOOL,   P_NONE,  NULL,                        NULL,0}
-@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
+@@ -386,9 +425,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -1028,7 +1031,7 @@ See the newly-created file "instructions" for more info.
  FN_LOCAL_STRING(lp_filter, filter)
  FN_LOCAL_STRING(lp_gid, gid)
  FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-@@ -403,14 +449,20 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -406,15 +452,21 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
  FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)
  FN_LOCAL_STRING(lp_refuse_options, refuse_options)
  FN_LOCAL_STRING(lp_secrets_file, secrets_file)
@@ -1045,6 +1048,7 @@ See the newly-created file "instructions" for more info.
  FN_LOCAL_INTEGER(lp_timeout, timeout)
  
 +FN_LOCAL_BOOL(lp_database_logging, database_logging)
+ FN_LOCAL_BOOL(lp_fake_super, fake_super)
 +FN_LOCAL_BOOL(lp_get_custom_id_before_insert,get_custom_id_before_insert)
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)