- char *uid;
- char *gid;
-@@ -161,6 +172,17 @@ static service sDefault =
- True, /* list */
- True, /* use chroot */
- False, /* transfer logging */
-+ False, /* Database Logging */
-+ NULL, /* Database datasource */
-+ NULL, /* Database username */
-+ NULL, /* Database password */
-+ NULL, /* Transfer table name */
-+ NULL, /* Exit table name */
-+ NULL, /* Session table name */
-+ NULL, /* sequence name */
-+ NULL, /* unique method */
-+ NULL, /* custom unique id select*/
-+ True, /* get custom id before insert */
- False, /* ignore errors */
- NOBODY_USER,/* uid */
- NOBODY_GROUP,/* gid */
-@@ -298,6 +320,17 @@ static struct parm_struct parm_table[] =
- {"include", P_STRING, P_LOCAL, &sDefault.include, NULL, 0},
- {"include from", P_STRING, P_LOCAL, &sDefault.include_from,NULL, 0},
- {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0},
-+ {"database logging", P_BOOL, P_LOCAL, &sDefault.database_logging,NULL,0},
-+ {"database datasource",P_STRING,P_LOCAL, &sDefault.database_datasource,NULL,0},
-+ {"database username",P_STRING, P_LOCAL, &sDefault.database_username,NULL,0},
-+ {"database password",P_STRING, P_LOCAL, &sDefault.database_password,NULL,0},
-+ {"transfer table name",P_STRING,P_LOCAL, &sDefault.transfer_table_name,NULL,0},
-+ {"exit table name", P_STRING, P_LOCAL, &sDefault.exit_table_name,NULL,0},
-+ {"session table name",P_STRING, P_LOCAL, &sDefault.session_table_name,NULL,0},
-+ {"sequence name", P_STRING, P_LOCAL, &sDefault.sequence_name,NULL,0},
-+ {"unique id method", P_STRING, P_LOCAL, &sDefault.unique_id_method,NULL,0},
-+ {"custom unique id select",P_STRING,P_LOCAL,&sDefault.custom_unique_id_select,NULL,0},
-+ {"get custom id before insert",P_BOOL,P_LOCAL,&sDefault.get_custom_id_before_insert,NULL,0},
- {"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors,NULL,0},
- {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL, 0},
- {"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options,NULL, 0},
-@@ -370,6 +403,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
- FN_LOCAL_BOOL(lp_list, list)
- FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
- FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
-+FN_LOCAL_BOOL(lp_database_logging, database_logging)
+ BOOL ignore_nonreadable;
+ BOOL list;
+@@ -173,9 +186,16 @@ static service sDefault =
+ {
+ /* auth_users; */ NULL,
+ /* comment; */ NULL,
++ /* custom_unique_id_select; */ NULL,
++ /* database_datasource; */ NULL,
++ /* database_password; */ NULL,
++ /* database_username; */ NULL,
++ /* delete_table_name; */ NULL,
+ /* dont_compress; */ DEFAULT_DONT_COMPRESS,
++ /* error_table_name; */ NULL,
+ /* exclude; */ NULL,
+ /* exclude_from; */ NULL,
++ /* exit_table_name; */ NULL,
+ /* filter; */ NULL,
+ /* gid; */ NOBODY_GROUP,
+ /* hosts_allow; */ NULL,
+@@ -193,15 +213,21 @@ static service sDefault =
+ /* prexfer_exec; */ NULL,
+ /* refuse_options; */ NULL,
+ /* secrets_file; */ NULL,
++ /* sequence_name; */ NULL,
++ /* session_table_name; */ NULL,
+ /* temp_dir; */ NULL,
++ /* transfer_table_name; */ NULL,
+ /* uid; */ NOBODY_USER,
++ /* unique_id_method; */ NULL,
+
+ /* max_connections; */ 0,
+ /* max_verbosity; */ 1,
+ /* syslog_facility; */ LOG_DAEMON,
+ /* timeout; */ 0,
+
++ /* database_logging; */ False,
+ /* fake_super; */ False,
++ /* get_custom_id_before_insert; */ True,
+ /* ignore_errors; */ False,
+ /* ignore_nonreadable; */ False,
+ /* list; */ True,
+@@ -300,11 +326,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},
++ {"custom unique id select",P_STRING,P_LOCAL,&sDefault.custom_unique_id_select,NULL,0},
++ {"database datasource",P_STRING,P_LOCAL, &sDefault.database_datasource,NULL,0},
++ {"database logging", P_BOOL, P_LOCAL, &sDefault.database_logging, NULL,0},
++ {"database password", P_STRING, P_LOCAL, &sDefault.database_password, NULL,0},
++ {"database username", P_STRING, P_LOCAL, &sDefault.database_username, NULL,0},
++ {"delete table name", P_STRING, P_LOCAL, &sDefault.delete_table_name, NULL,0},
+ {"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress, NULL,0},
++ {"error table name", P_STRING, P_LOCAL, &sDefault.error_table_name, NULL,0},
+ {"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},
+@@ -329,12 +364,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},
++ {"sequence name", P_STRING, P_LOCAL, &sDefault.sequence_name, NULL,0},
++ {"session table name",P_STRING, P_LOCAL, &sDefault.session_table_name,NULL,0},
+ {"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes, NULL,0},
+ {"syslog facility", P_ENUM, P_LOCAL, &sDefault.syslog_facility,enum_facilities,0},
+ {"temp dir", P_PATH, P_LOCAL, &sDefault.temp_dir, NULL,0},
+ {"timeout", P_INTEGER,P_LOCAL, &sDefault.timeout, NULL,0},
+ {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging, NULL,0},
++ {"transfer table name",P_STRING,P_LOCAL, &sDefault.transfer_table_name,NULL,0},
+ {"uid", P_STRING, P_LOCAL, &sDefault.uid, NULL,0},
++ {"unique id method", P_STRING, P_LOCAL, &sDefault.unique_id_method, NULL,0},
+ {"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}
+@@ -390,9 +429,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
+
+ FN_LOCAL_STRING(lp_auth_users, auth_users)
+ FN_LOCAL_STRING(lp_comment, comment)
++FN_LOCAL_STRING(lp_custom_unique_id_select,custom_unique_id_select)