diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 09:19:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 12:35:56 +0200 |
| commit | cda86869400285afe17db87a9a666fbcc5b918a8 (patch) | |
| tree | d5e36a1f276729a827c2303bdfad56b8aacff55f /lib/param/loadparm.h | |
| parent | cf406f7e7d58b9c993ba1ddc6471fa85e445ba88 (diff) | |
| download | samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.gz samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.bz2 samba-cda86869400285afe17db87a9a666fbcc5b918a8.zip | |
lib/param: Merge struct loadparm_service into common
This is handled by a common header and a .c file that is included into
both loadparm.c files.
In the process, _lp functions were renamed to lp__ to allow the common
function definition declarations to be used by source3 and source4
(which have different macro definitions).
The only parameter to change type is 'strict_locking' which was a
bool, and is now an int, to accommodate the 'Auto' value from source3.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Jul 8 12:35:56 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/param/loadparm.h')
| -rw-r--r-- | lib/param/loadparm.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index d36f5a0f6e..1fa06b6587 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -116,3 +116,19 @@ struct parm_struct { #ifndef PRINT_MAX_JOBID #define PRINT_MAX_JOBID 10000 #endif + +#define LOADPARM_EXTRA_LOCALS \ + bool valid; \ + int usershare; \ + struct timespec usershare_last_mod; \ + int iMaxPrintJobs; \ + char *szCopy; \ + char *szService; \ + char *szInclude; \ + bool bWidelinks; \ + int bAvailable; \ + struct parmlist_entry *param_opt; \ + struct bitmap *copymap; \ + char dummy[3]; /* for alignment */ + +#include "lib/param/param_local.h" |