#define strequal(a,b) (strcasecmp(a,b)==0)
#define BOOLSTR(b) ((b) ? "Yes" : "No")
typedef char pstring[1024];
-#define pstrcpy(a,b) strcpy(a,b)
+#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)-1)
/* the following are used by loadparm for option lists */
typedef enum
{
- P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,
- P_STRING,P_GSTRING,P_ENUM,P_SEP
+ P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,
+ P_STRING,P_GSTRING,P_ENUM,P_SEP
} parm_type;
typedef enum
{
- P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
+ P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
} parm_class;
struct enum_list {
typedef struct
{
char *motd_file;
+ char *lock_file;
+ int syslog_facility;
+ int max_connections;
} global;
static global Globals;
BOOL list;
char *uid;
char *gid;
+ char *hosts_allow;
+ char *hosts_deny;
+ char *auth_users;
+ char *secrets_file;
} service;
True, /* list */
"nobody",/* uid */
"nobody",/* gid */
+ NULL, /* hosts allow */
+ NULL, /* hosts deny */
+ NULL, /* auth users */
+ NULL, /* secrets file */
};
#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
+static struct enum_list enum_facilities[] = {
+#ifdef LOG_AUTH
+ { LOG_AUTH, "auth" },
+#endif
+#ifdef LOG_AUTHPRIV
+ { LOG_AUTHPRIV, "authpriv" },
+#endif
+#ifdef LOG_CRON
+ { LOG_CRON, "cron" },
+#endif
+#ifdef LOG_DAEMON
+ { LOG_DAEMON, "daemon" },
+#endif
+#ifdef LOG_FTP
+ { LOG_FTP, "ftp" },
+#endif
+#ifdef LOG_KERN
+ { LOG_KERN, "kern" },
+#endif
+#ifdef LOG_LPR
+ { LOG_LPR, "lpr" },
+#endif
+#ifdef LOG_MAIL
+ { LOG_MAIL, "mail" },
+#endif
+#ifdef LOG_NEWS
+ { LOG_NEWS, "news" },
+#endif
+#ifdef LOG_AUTH
+ { LOG_AUTH, "security" },
+#endif
+#ifdef LOG_SYSLOG
+ { LOG_SYSLOG, "syslog" },
+#endif
+#ifdef LOG_USER
+ { LOG_USER, "user" },
+#endif
+#ifdef LOG_UUCP
+ { LOG_UUCP, "uucp" },
+#endif
+#ifdef LOG_LOCAL0
+ { LOG_LOCAL0, "local0" },
+#endif
+#ifdef LOG_LOCAL1
+ { LOG_LOCAL1, "local1" },
+#endif
+#ifdef LOG_LOCAL2
+ { LOG_LOCAL2, "local2" },
+#endif
+#ifdef LOG_LOCAL3
+ { LOG_LOCAL3, "local3" },
+#endif
+#ifdef LOG_LOCAL4
+ { LOG_LOCAL4, "local4" },
+#endif
+#ifdef LOG_LOCAL5
+ { LOG_LOCAL5, "local5" },
+#endif
+#ifdef LOG_LOCAL6
+ { LOG_LOCAL6, "local6" },
+#endif
+#ifdef LOG_LOCAL7
+ { LOG_LOCAL7, "local7" },
+#endif
+ { -1, NULL }};
+
/* note that we do not initialise the defaults union - it is not allowed in ANSI C */
static struct parm_struct parm_table[] =
{
+ {"max connections", P_INTEGER, P_GLOBAL, &Globals.max_connections,NULL, 0},
{"motd file", P_STRING, P_GLOBAL, &Globals.motd_file, NULL, 0},
+ {"lock file", P_STRING, P_GLOBAL, &Globals.lock_file, NULL, 0},
+ {"syslog facility", P_ENUM, P_GLOBAL, &Globals.syslog_facility, enum_facilities,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},
{"list", P_BOOL, P_LOCAL, &sDefault.list, 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},
{NULL, P_BOOL, P_NONE, NULL, NULL, 0}
};
***************************************************************************/
static void init_globals(void)
{
+#ifdef LOG_DAEMON
+ Globals.syslog_facility = LOG_DAEMON;
+#endif
+ Globals.lock_file = "/var/run/rsyncd.lock";
}
/***************************************************************************
FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file)
+FN_GLOBAL_STRING(lp_lock_file, &Globals.lock_file)
+FN_GLOBAL_INTEGER(lp_max_connections, &Globals.max_connections)
+FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
FN_LOCAL_STRING(lp_name, name)
FN_LOCAL_STRING(lp_comment, comment)
FN_LOCAL_STRING(lp_path, path)
FN_LOCAL_BOOL(lp_list, list)
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)
/* local prototypes */
static int strwicmp( char *psz1, char *psz2 );
break;
}
}
+ if (!parm_table[parmnum].enum_list[i].name) {
+ *(int *)parm_ptr = atoi(parmvalue);
+ }
break;
case P_SEP:
break;