added support for --include, --include-from and the +/- syntax

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index ceb06a5..a302f46 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -101,6 +101,7 @@ typedef struct
        char *lock_file;
        int syslog_facility;
        int max_connections;
+       char *socket_options;
 } global;
 
 static global Globals;
@@ -123,6 +124,8 @@ typedef struct
        char *hosts_deny;
        char *auth_users;
        char *secrets_file;
+       char *exclude;
+       char *exclude_from;
 } service;
 
 
@@ -140,6 +143,8 @@ static service sDefault =
        NULL,    /* hosts deny */
        NULL,    /* auth users */
        NULL,    /* secrets file */
+       NULL,    /* exclude */
+       NULL,    /* exclude from */
 };
 
 
@@ -152,6 +157,72 @@ static BOOL bInGlobalSection = True;
 
 #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[] =
@@ -159,7 +230,9 @@ 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_INTEGER, P_GLOBAL, &Globals.syslog_facility, NULL,0},
+  {"syslog facility",  P_ENUM,    P_GLOBAL, &Globals.syslog_facility, enum_facilities,0},
+  {"socket options",   P_STRING,  P_GLOBAL, &Globals.socket_options,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},
@@ -171,6 +244,8 @@ static struct parm_struct parm_table[] =
   {"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},
+  {"exclude",          P_STRING,  P_LOCAL,  &sDefault.exclude,     NULL,   0},
+  {"exclude from",     P_STRING,  P_LOCAL,  &sDefault.exclude_from,NULL,   0},
   {NULL,               P_BOOL,    P_NONE,   NULL,                  NULL,   0}
 };
 
@@ -180,6 +255,7 @@ Initialise the global parameter structure.
 ***************************************************************************/
 static void init_globals(void)
 {
+       memset(&Globals, 0, sizeof(Globals));
 #ifdef LOG_DAEMON
        Globals.syslog_facility = LOG_DAEMON;
 #endif
@@ -220,8 +296,10 @@ static void init_locals(void)
 
 FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file)
 FN_GLOBAL_STRING(lp_lock_file, &Globals.lock_file)
+FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 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)
@@ -233,6 +311,8 @@ 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_STRING(lp_exclude, exclude)
+FN_LOCAL_STRING(lp_exclude_from, exclude_from)
 
 /* local prototypes */
 static int    strwicmp( char *psz1, char *psz2 );
@@ -508,7 +588,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
        break;
 
      case P_GSTRING:
-       strcpy((char *)parm_ptr,parmvalue);
+       strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)-1);
        break;
 
      case P_ENUM:
@@ -518,6 +598,10 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
                             break;
                     }
             }
+            if (!parm_table[parmnum].enum_list[i].name) {
+                    if (atoi(parmvalue) > 0)
+                            *(int *)parm_ptr = atoi(parmvalue);
+            }
             break;
      case P_SEP:
             break;
@@ -585,26 +669,26 @@ static BOOL do_section(char *sectionname)
 Load the services array from the services file. Return True on success, 
 False on failure.
 ***************************************************************************/
-BOOL lp_load(char *pszFname)
+BOOL lp_load(char *pszFname, int globals_only)
 {
-  pstring n2;
-  BOOL bRetval;
+       pstring n2;
+       BOOL bRetval;
  
-  bRetval = False;
+       bRetval = False;
 
-  bInGlobalSection = True;
+       bInGlobalSection = True;
   
-  init_globals();
+       init_globals();
 
-  pstrcpy(n2,pszFname);
+       pstrcpy(n2,pszFname);
 
-  /* We get sections first, so have to start 'behind' to make up */
-  iServiceIndex = -1;
-  bRetval = pm_process(n2, do_section, do_parameter);
+       /* 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;
+       bLoaded = True;
 
-  return (bRetval);
+       return (bRetval);
 }