From 489f528857bfb4993cf44dd7a5391ac5196c0747 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 29 Jun 2011 15:33:54 +1000 Subject: param: Merge param headers into lib/param/loadparm.h This defines a common table format, so we can in future define a common table. Andrew Bartlett --- source3/include/local.h | 29 ---------------------------- source3/include/proto.h | 3 +++ source3/include/smb.h | 50 ------------------------------------------------- 3 files changed, 3 insertions(+), 79 deletions(-) (limited to 'source3/include') diff --git a/source3/include/local.h b/source3/include/local.h index 680631c1c5..594f7003ef 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -5,26 +5,6 @@ #ifndef _LOCAL_H #define _LOCAL_H -/* The default workgroup - usually overridden in smb.conf */ -#ifndef WORKGROUP -#define WORKGROUP "WORKGROUP" -#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" - -/* This defines the section name in the configuration file that will - refer to the special "homes" service */ -#define HOMES_NAME "homes" - -/* This defines the section name in the configuration file that will - refer to the special "printers" service */ -#define PRINTERS_NAME "printers" - /* Yves Gaige requested this set this */ /* to a maximum of 8 if old smb clients break because of long printer names. */ #define MAXPRINTERLEN 15 @@ -171,12 +151,6 @@ it are worked out */ #define USE_READ_PREDICTION 0 -/* - * Default passwd chat script. - */ - -#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" - /* Minimum length of allowed password when changing UNIX password. */ #define MINPASSWDLENGTH 5 @@ -212,9 +186,6 @@ /* this enables the "rabbit pellet" fix for SMBwritebraw */ #define RABBIT_PELLET_FIX 1 -/* Max number of jobs per print queue. */ -#define PRINT_MAX_JOBID 10000 - /* Max number of open RPC pipes. */ #define MAX_OPEN_PIPES 2048 diff --git a/source3/include/proto.h b/source3/include/proto.h index 20b5c0e2a7..73bd9baf5e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1545,6 +1545,7 @@ const char **lp_parm_string_list(int snum, const char *type, const char *option, int lp_parm_int(int snum, const char *type, const char *option, int def); unsigned long lp_parm_ulong(int snum, const char *type, const char *option, unsigned long def); bool lp_parm_bool(int snum, const char *type, const char *option, bool def); +struct enum_list; int lp_parm_enum(int snum, const char *type, const char *option, const struct enum_list *_enum, int def); char *canonicalize_servicename(TALLOC_CTX *ctx, const char *src); @@ -1577,6 +1578,8 @@ const char *lp_ldap_machine_suffix(void); const char *lp_ldap_user_suffix(void); const char *lp_ldap_group_suffix(void); const char *lp_ldap_idmap_suffix(void); +struct loadparm_service; +struct parm_struct; void *lp_parm_ptr(struct loadparm_service *service, struct parm_struct *parm); void *lp_local_ptr_by_snum(int snum, struct parm_struct *parm); bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue); diff --git a/source3/include/smb.h b/source3/include/smb.h index 598a0e9c4a..c867d607b6 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -709,56 +709,6 @@ struct connections_data { uint32 unused_compatitibility_field; }; - -/* the following are used by loadparm for option lists */ -typedef enum { - P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST, - P_STRING,P_USTRING,P_ENUM,P_SEP -} parm_type; - -typedef enum { - P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE -} parm_class; - -struct enum_list { - int value; - const char *name; -}; - -struct loadparm_service; -struct loadparm_context; - -struct parm_struct { - const char *label; - parm_type type; - parm_class p_class; - offset_t offset; - bool (*special)(struct loadparm_context *lpcfg_ctx, - int snum, const char *, char **); - const struct enum_list *enum_list; - unsigned flags; - union { - bool bvalue; - int ivalue; - char *svalue; - char cvalue; - char **lvalue; - } def; -}; - -/* The following flags are used in SWAT */ -#define FLAG_BASIC 0x0001 /* Display only in BASIC view */ -#define FLAG_SHARE 0x0002 /* file sharing options */ -#define FLAG_PRINT 0x0004 /* printing options */ -#define FLAG_GLOBAL 0x0008 /* local options that should be globally settable in SWAT */ -#define FLAG_WIZARD 0x0010 /* Parameters that the wizard will operate on */ -#define FLAG_ADVANCED 0x0020 /* Parameters that will be visible in advanced view */ -#define FLAG_DEVELOPER 0x0040 /* No longer used */ -#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */ -#define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */ -#define FLAG_META 0x8000 /* A meta directive - not a real parameter */ -#define FLAG_CMDLINE 0x10000 /* option has been overridden */ - struct bitmap { uint32 *b; unsigned int n; -- cgit