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
Add "include" and "include from" rsyncd.conf options. Contributed
[rsync/rsync.git]
/
loadparm.c
diff --git
a/loadparm.c
b/loadparm.c
index
aeb2980
..
8bd5cf2
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
@@
-129,6
+129,12
@@
typedef struct
char *secrets_file;
char *exclude;
char *exclude_from;
char *secrets_file;
char *exclude;
char *exclude_from;
+ char *include;
+ char *include_from;
+ char *log_format;
+ char *refuse_options;
+ char *dont_compress;
+ int timeout;
} service;
} service;
@@
-150,6
+156,12
@@
static service sDefault =
NULL, /* secrets file */
NULL, /* exclude */
NULL, /* exclude from */
NULL, /* secrets file */
NULL, /* exclude */
NULL, /* exclude from */
+ NULL, /* include */
+ NULL, /* include from */
+ "%o %h [%a] %m (%u) %f %l", /* log format */
+ NULL, /* refuse options */
+ "*.gz *.tgz *.zip *.z *.rpm *.deb", /* dont compress */
+ 0 /* timeout */
};
};
@@
-240,6
+252,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},
@@
-254,7
+267,12
@@
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},
+ {"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},
{"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},
+ {"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress,NULL, 0},
{NULL, P_BOOL, P_NONE, NULL, NULL, 0}
};
{NULL, P_BOOL, P_NONE, NULL, NULL, 0}
};
@@
-326,6
+344,12
@@
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_include, include)
+FN_LOCAL_STRING(lp_include_from, include_from)
+FN_LOCAL_STRING(lp_log_format, log_format)
+FN_LOCAL_STRING(lp_refuse_options, refuse_options)
+FN_LOCAL_STRING(lp_dont_compress, dont_compress)
+FN_LOCAL_INTEGER(lp_timeout, timeout)
/* local prototypes */
static int strwicmp( char *psz1, char *psz2 );
/* local prototypes */
static int strwicmp( char *psz1, char *psz2 );
@@
-354,7
+378,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
);
}
}
@@
-444,7
+468,7
@@
static int map_parameter(char *parmname)
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
- rprintf(FERROR, "Unknown
p
arameter encountered: \"%s\"\n", parmname);
+ rprintf(FERROR, "Unknown
P
arameter encountered: \"%s\"\n", parmname);
return(-1);
}
return(-1);
}
@@
-556,7
+580,7
@@
static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
if (parmnum < 0)
{
if (parmnum < 0)
{
- rprintf(FERROR, "I
gnoring
unknown parameter \"%s\"\n", parmname);
+ rprintf(FERROR, "I
GNORING
unknown parameter \"%s\"\n", parmname);
return(True);
}
return(True);
}
@@
-602,7
+626,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: