diff options
| -rw-r--r-- | lib/util/util.h | 2 | ||||
| -rw-r--r-- | source4/client/client.c | 6 | ||||
| -rw-r--r-- | source4/include/includes.h | 2 | ||||
| -rw-r--r-- | source4/include/local.h | 51 | ||||
| -rw-r--r-- | source4/param/generic.c | 3 | ||||
| -rw-r--r-- | source4/param/loadparm.h | 30 |
6 files changed, 35 insertions, 59 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index 1cf60bae39..6a341b218d 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -353,6 +353,8 @@ _PUBLIC_ bool strequal(const char *s1, const char *s2); /* The following definitions come from lib/util/util_strlist.c */ +/* separators for lists */ +#define LIST_SEP " \t,\n\r" /** build a null terminated list of strings from a input string and a diff --git a/source4/client/client.c b/source4/client/client.c index a61d1b4ca4..56b923974b 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -53,6 +53,12 @@ #include "param/param.h" #include "librpc/rpc/dcerpc.h" +/* the default pager to use for the client "more" command. Users can + * override this with the PAGER environment variable */ +#ifndef DEFAULT_PAGER +#define DEFAULT_PAGER "more" +#endif + struct smbclient_context { char *remote_cur_dir; struct smbcli_state *cli; diff --git a/source4/include/includes.h b/source4/include/includes.h index 6065cfc17c..08d6cdb5f6 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -30,8 +30,6 @@ #endif #endif /* NO_CONFIG_H */ -#include "local.h" - #include "system/time.h" #include "system/wait.h" diff --git a/source4/include/local.h b/source4/include/local.h deleted file mode 100644 index 5036f54802..0000000000 --- a/source4/include/local.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 1995-1998 Samba-Team */ -/* Copyright (C) 1998 John H Terpstra <jht@aquasoft.com.au> */ - -/* local definitions for file server */ -#ifndef _LOCAL_H -#define _LOCAL_H - -/* The default workgroup - usually overridden in smb.conf */ -#ifndef DEFAULT_WORKGROUP -#define DEFAULT_WORKGROUP "WORKGROUP" -#endif - -/* the maximum debug level to compile into the code. This assumes a good - optimising compiler that can remove unused code - for embedded or low-memory systems set this to a value like 2 to get - only important messages. This gives *much* smaller binaries -*/ -#ifndef MAX_DEBUG_LEVEL -#define MAX_DEBUG_LEVEL 1000 -#endif - -/* This defines the section name in the configuration file that will contain */ -/* global parameters - that is, parameters relating to the whole server, not */ -/* just services. This name is then reserved, and may not be used as a */ -/* a service name. It will default to "global" if not defined here. */ -#define GLOBAL_NAME "global" -#define GLOBAL_NAME2 "globals" - -/* define what facility to use for syslog */ -#ifndef SYSLOG_FACILITY -#define SYSLOG_FACILITY LOG_DAEMON -#endif - -/* separators for lists */ -#define LIST_SEP " \t,\n\r" - -/* the default pager to use for the client "more" command. Users can - override this with the PAGER environment variable */ -#ifndef DEFAULT_PAGER -#define DEFAULT_PAGER "more" -#endif - -/* - * Default passwd chat script. - */ -#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" - -/* Max number of jobs per print queue. */ -#define PRINT_MAX_JOBID 10000 - -#endif diff --git a/source4/param/generic.c b/source4/param/generic.c index ed3045605d..292b91690f 100644 --- a/source4/param/generic.c +++ b/source4/param/generic.c @@ -127,9 +127,6 @@ const char **param_get_string_list(struct param_context *ctx, const char *param, if (p == NULL) return NULL; - if (separator == NULL) - separator = LIST_SEP; - return (const char **)str_list_make(ctx, p->value, separator); } diff --git a/source4/param/loadparm.h b/source4/param/loadparm.h index cd3c0b9595..47bce75cfb 100644 --- a/source4/param/loadparm.h +++ b/source4/param/loadparm.h @@ -59,9 +59,6 @@ struct parm_struct { } def; }; - - - #define FLAG_DEFAULT 0x0001 /* this option was a default */ #define FLAG_CMDLINE 0x0002 /* this option was set from the command line */ @@ -73,3 +70,30 @@ struct parm_struct { #define HOMES_NAME "homes" #endif +/* This defines the section name in the configuration file that will contain */ +/* global parameters - that is, parameters relating to the whole server, not */ +/* just services. This name is then reserved, and may not be used as a */ +/* a service name. It will default to "global" if not defined here. */ +#ifndef GLOBAL_NAME +#define GLOBAL_NAME "global" +#define GLOBAL_NAME2 "globals" +#endif + +/* The default workgroup - usually overridden in smb.conf */ +#ifndef DEFAULT_WORKGROUP +#define DEFAULT_WORKGROUP "WORKGROUP" +#endif + +/* + * Default passwd chat script. + */ +#ifndef DEFAULT_PASSWD_CHAT +#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" +#endif + +/* Max number of jobs per print queue. */ +#ifndef PRINT_MAX_JOBID +#define PRINT_MAX_JOBID 10000 +#endif + + |