Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added "refuse options" option
[rsync/rsync.git]
/
loadparm.c
diff --git
a/loadparm.c
b/loadparm.c
index
aba7d30
..
ea0f9be
100644
(file)
--- a/
loadparm.c
+++ b/
loadparm.c
@@
-51,7
+51,7
@@
#define strequal(a,b) (strcasecmp(a,b)==0)
#define BOOLSTR(b) ((b) ? "Yes" : "No")
typedef char pstring[1024];
#define strequal(a,b) (strcasecmp(a,b)==0)
#define BOOLSTR(b) ((b) ? "Yes" : "No")
typedef char pstring[1024];
-#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)
-1
)
+#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring))
/* the following are used by loadparm for option lists */
typedef enum
/* the following are used by loadparm for option lists */
typedef enum
@@
-120,6
+120,7
@@
typedef struct
BOOL read_only;
BOOL list;
BOOL use_chroot;
BOOL read_only;
BOOL list;
BOOL use_chroot;
+ BOOL transfer_logging;
char *uid;
char *gid;
char *hosts_allow;
char *uid;
char *gid;
char *hosts_allow;
@@
-128,6
+129,9
@@
typedef struct
char *secrets_file;
char *exclude;
char *exclude_from;
char *secrets_file;
char *exclude;
char *exclude_from;
+ char *log_format;
+ char *refuse_options;
+ int timeout;
} service;
} service;
@@
-140,6
+144,7
@@
static service sDefault =
True, /* read only */
True, /* list */
True, /* use chroot */
True, /* read only */
True, /* list */
True, /* use chroot */
+ False, /* transfer logging */
"nobody",/* uid */
"nobody",/* gid */
NULL, /* hosts allow */
"nobody",/* uid */
"nobody",/* gid */
NULL, /* hosts allow */
@@
-148,6
+153,9
@@
static service sDefault =
NULL, /* secrets file */
NULL, /* exclude */
NULL, /* exclude from */
NULL, /* secrets file */
NULL, /* exclude */
NULL, /* exclude from */
+ "%o %h [%a] %m (%u) %f %l", /* log format */
+ NULL, /* refuse options */
+ 0 /* timeout */
};
};
@@
-238,6
+246,7
@@
static struct parm_struct parm_table[] =
{"log file", P_STRING, P_GLOBAL, &Globals.log_file, NULL, 0},
{"pid file", P_STRING, P_GLOBAL, &Globals.pid_file, NULL, 0},
{"log file", P_STRING, P_GLOBAL, &Globals.log_file, NULL, 0},
{"pid file", P_STRING, P_GLOBAL, &Globals.pid_file, NULL, 0},
+ {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0},
{"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0},
{"path", P_STRING, P_LOCAL, &sDefault.path, NULL, 0},
{"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0},
{"path", P_STRING, P_LOCAL, &sDefault.path, NULL, 0},
@@
-252,6
+261,9
@@
static struct parm_struct parm_table[] =
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file,NULL, 0},
{"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL, 0},
{"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from,NULL, 0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file,NULL, 0},
{"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL, 0},
{"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from,NULL, 0},
+ {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0},
+ {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL, 0},
+ {"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options,NULL, 0},
{NULL, P_BOOL, P_NONE, NULL, NULL, 0}
};
{NULL, P_BOOL, P_NONE, NULL, NULL, 0}
};
@@
-314,6
+326,7
@@
FN_LOCAL_STRING(lp_path, path)
FN_LOCAL_BOOL(lp_read_only, read_only)
FN_LOCAL_BOOL(lp_list, list)
FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_read_only, read_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_STRING(lp_uid, uid)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
FN_LOCAL_STRING(lp_uid, uid)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
@@
-322,6
+335,9
@@
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
+FN_LOCAL_STRING(lp_log_format, log_format)
+FN_LOCAL_STRING(lp_refuse_options, refuse_options)
+FN_LOCAL_INTEGER(lp_timeout, timeout)
/* local prototypes */
static int strwicmp( char *psz1, char *psz2 );
/* local prototypes */
static int strwicmp( char *psz1, char *psz2 );
@@
-350,7
+366,7
@@
static void string_set(char **s, char *v)
return;
}
*s = strdup(v);
return;
}
*s = strdup(v);
- if (!*s) exit_cleanup(
1
);
+ if (!*s) exit_cleanup(
RERR_MALLOC
);
}
}
@@
-598,7
+614,7
@@
static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
break;
case P_GSTRING:
break;
case P_GSTRING:
- strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)
-1
);
+ strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring));
break;
case P_ENUM:
break;
case P_ENUM: