/* This is based on loadparm.c from Samba, written by Andrew Tridgell
and Karl Auer */
+/* some fixes
+ *
+ * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ */
+
/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*
*/
+/* TODO: Parameter to set debug level on server. */
+
#include "rsync.h"
#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2)))
#define strequal(a,b) (strcasecmp(a,b)==0)
unsigned flags;
};
-static BOOL bLoaded = False;
-
#ifndef GLOBAL_NAME
#define GLOBAL_NAME "global"
#endif
BOOL list;
BOOL use_chroot;
BOOL transfer_logging;
+ BOOL ignore_errors;
char *uid;
char *gid;
char *hosts_allow;
char *hosts_deny;
char *auth_users;
char *secrets_file;
+ BOOL strict_modes;
char *exclude;
char *exclude_from;
char *include;
char *dont_compress;
int timeout;
int max_connections;
+ BOOL ignore_nonreadable;
} service;
True, /* list */
True, /* use chroot */
False, /* transfer logging */
+ False, /* ignore errors */
"nobody",/* uid */
+
+ /* TODO: This causes problems on Debian, where it is called
+ * "nogroup". Debian patch this in their version of the
+ * package, but it would be nice to be consistent. Possibly
+ * other systems are different again.
+ *
+ * What is the best behaviour? Perhaps always using (gid_t)
+ * -2? */
"nobody",/* gid */
+
NULL, /* hosts allow */
NULL, /* hosts deny */
NULL, /* auth users */
NULL, /* secrets file */
+ True, /* strict modes */
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 */
+ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", /* dont compress */
0, /* timeout */
- 0 /* max connections */
+ 0, /* max connections */
+ False /* ignore nonreadable */
};
{"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL, 0},
{"list", P_BOOL, P_LOCAL, &sDefault.list, NULL, 0},
{"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL, 0},
+ {"ignore nonreadable",P_BOOL, P_LOCAL, &sDefault.ignore_nonreadable, NULL, 0},
{"uid", P_STRING, P_LOCAL, &sDefault.uid, 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},
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL, 0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file,NULL, 0},
+ {"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes,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},
+ {"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},
{"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress,NULL, 0},
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_ignore_errors, ignore_errors)
+FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_STRING(lp_uid, uid)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
+FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_include, include)
copy_service(pservice,&sDefault);
}
-static void string_set(char **s, char *v)
+
+/**
+ * Assign a copy of @p v to @p *s. Handles NULL strings. @p *v must
+ * be initialized when this is called, either to NULL or a malloc'd
+ * string.
+ *
+ * @fixme There is a small leak here in that sometimes the existing
+ * value will be dynamically allocated, and the old copy is lost.
+ * However, we can't always deallocate the old value, because in the
+ * case of sDefault, it points to a static string. It would be nice
+ * to have either all-strdup'd values, or to never need to free
+ * memory.
+ **/
+static void string_set(char **s, const char *v)
{
if (!v) {
*s = NULL;
return;
}
*s = strdup(v);
- if (!*s) exit_cleanup(RERR_MALLOC);
+ if (!*s)
+ exit_cleanup(RERR_MALLOC);
}
/* sync the strings on first non-whitespace */
while (1)
{
- while (isspace(*psz1))
+ while (isspace(* (unsigned char *) psz1))
psz1++;
- while (isspace(*psz2))
+ while (isspace(* (unsigned char *) psz2))
psz2++;
- if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0' || *psz2 == '\0')
+ if (toupper(* (unsigned char *) psz1) != toupper(* (unsigned char *) psz2)
+ || *psz1 == '\0' || *psz2 == '\0')
break;
psz1++;
psz2++;
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
+ extern int am_server;
+ extern int am_daemon;
+ extern int am_root;
pstring n2;
BOOL bRetval;
init_globals();
- pstrcpy(n2,pszFname);
+ if (pszFname)
+ pstrcpy(n2,pszFname);
+ else if (am_server && am_daemon && !am_root)
+ pstrcpy(n2,RSYNCD_USERCONF);
+ else
+ pstrcpy(n2,RSYNCD_SYSCONF);
/* We get sections first, so have to start 'behind' to make up */
iServiceIndex = -1;
bRetval = pm_process(n2, globals_only?NULL:do_section, do_parameter);
- bLoaded = True;
-
return (bRetval);
}