1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Commit Graph

370 Commits

Author SHA1 Message Date
Andrew Bartlett
399eae13a1 s4-provision set passdb backend to 'samba4' in template smb.conf files
This will allow smbpasswd, net sam and pdbedit to 'just work' against
the newly created databases.

Andrew Bartlett
2011-08-22 09:00:59 +10:00
Andrew Bartlett
b51f97325b s4-param Set szConfigFile even for s3 loadparm contexts 2011-08-13 20:18:41 +10:00
Andrew Bartlett
7c9ecf35fa param: Add smb.conf loading support to s3/s4 loadparm bridge 2011-08-13 12:30:49 +10:00
Björn Baumbach
bed50f04cb s4-param: use "state directory" and "cache directory" options
instead of "state dir" and "cache dir" in order be compatible
with the source3 code.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-07-21 08:51:54 +02:00
Andrew Bartlett
0e4a4c8b19 s4-param finish services hooks for s4->s3 loadparm context 2011-07-14 15:06:45 +10:00
Andrew Bartlett
07f14aa3a7 s4-param cope with parameters of type char 2011-07-14 15:06:45 +10:00
Stefan Metzmacher
c0eb56d159 s4:param: add "state dir" and "cache dir" options
metze
2011-07-12 14:58:34 +02:00
Andrew Bartlett
cda8686940 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
2011-07-08 12:35:56 +02:00
Andrew Bartlett
2fcbfcd004 param: Move per-share parameters into a seperate file, to share with s3
This will allow the struct loadparm_service to be in common between
the two loadparm implementations in the tree.

Andrew Bartlett
2011-07-08 11:23:23 +02:00
Andrew Bartlett
f50f9374b5 s4-param Remove offset != -1 checks
No offset values are set to -1 in the parameter table

Andrew Bartlett
2011-07-08 11:23:23 +02:00
Andrew Bartlett
61b937d236 s4-param change to struct bitmap to match s3-param 2011-07-08 11:23:23 +02:00
Andrew Bartlett
27e169e17e s4-param Also check the p_class matches when comparing offset 2011-07-08 11:23:23 +02:00
Andrew Bartlett
6b2749f8a9 param: Add hooks to s3 parm_struct and the parameters void * pointer
This is to that the pyparam hooks can use the hooks to connect with
the s3 loadparm system.  This now also includes per-service
parameters.

Andrew Bartlett
2011-07-08 11:23:23 +02:00
Andrew Bartlett
7e52436673 s4-param Remove unused 'announce version'
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Jul  2 05:42:37 CEST 2011 on sn-devel-104
2011-07-02 05:42:37 +02:00
Andrew Bartlett
d4ef70a764 param: Finish conversion from lp_wins_support() -> lp_we_are_a_wins_server()
Jermey started this in 1997 with 0aa493cc03

(avoiding the duplicate function makes it easier to generate the
struct loadparm_globals).

Andrew Bartlett
2011-07-02 12:31:34 +10:00
Andrew Bartlett
8b04345a0e s4-param Handle BOOLREV parameters
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Jun 29 08:57:27 CEST 2011 on sn-devel-104
2011-06-29 08:57:27 +02:00
Andrew Bartlett
3b0b0d3c51 s4-param Match source3's param: use C99 initialisers
This makes it much easier to compare the parameter sets.

Andrew Bartlett
2011-06-29 15:44:09 +10:00
Andrew Bartlett
7384a2b0b7 s4-param Merge struct parm_struct with version from source3/ 2011-06-29 15:44:09 +10:00
Andrew Bartlett
7198d540e8 param: Merge struct parm_struct definitions
This will allow the parameter tables to be shared between source3 and
source4.

Andrew Bartlett
2011-06-29 15:44:08 +10:00
Andrew Bartlett
3d08e844fc param: Remove remaining references to announce as and announce version 2011-06-24 13:08:04 +10:00
Andrew Bartlett
38b5beb33d param: Remove "announce as" parameter 2011-06-23 13:47:27 +02:00
Andrew Bartlett
125a2ff262 lib/util/charset: Remove 'display charset'
As discussed in 'CH_DISPLAY and gettext' on the samba-technical list:
http://lists.samba.org/archive/samba-technical/2011-June/078190.html

Setting this to a value other than 'unix charset' does not make sense,
as any system where the filesytem charset does not equal the terminal
charset will already have problems with programs as simple as 'ls'.
It also means that our output could not be pasted as our input in
interactive programs or onto our command line, as we never did
translate in the DISPLAY -> UNIX direction.

The d_printf() calls are retained in case we need to revisit this, and
to support display_set_stderr().

Andrew Bartlett
2011-06-23 13:47:27 +02:00
Andrew Bartlett
233a6223b2 s4-param Autogenerate the loadparm_globals and loadparm_service tables
This makes it much easier and less error prone to add new parameters
as we merge the s3 and s4 loadparm systems.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Jun 21 04:41:54 CEST 2011 on sn-devel-104
2011-06-21 04:41:54 +02:00
Andrew Bartlett
f83fca1c57 lib/util: Use common d_printf() in the whole codebase
This removes the lang_tdb based varient, the only user of the lang_tdb
code is SWAT, which calls that directly.

'net' and 'pam_winbind' are internationalised using gettext.

Andrew Bartlett
2011-06-21 09:35:34 +10:00
Andrew Bartlett
6c3f35bafe s4-param add const to loadparm_init_s3 s3_fns 2011-06-09 12:40:09 +02:00
Andrew Bartlett
5197331fe5 s4-auth Move default auth methods back into auth.c
This changes auth_methods_from_lp to no longer use the parametric
options, and to cope with ROLE_DOMAIN_BDC and ROLE_DOMAIN_PDC.  This
will assist in calling the source4 auth subsystem with a source3
derived lp_ctx.

Andrew Bartlett
2011-06-07 09:11:01 +10:00
Andrew Bartlett
b9108cac52 s3-s4-param: Add hooks for parametric options in the s3/s4 glue layer
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Jun  6 10:48:53 CEST 2011 on sn-devel-104
2011-06-06 10:48:53 +02:00
Andrew Bartlett
f67a14976b s4-param Remove 'modules dir'
The Samba waf build ensures that dyn_MODULESDIR is always correct
(even for in-tree binaries), so we don't need to allow the user to
configure this at run time.

Andrew Bartlett
2011-06-06 17:37:51 +10:00
Andrew Bartlett
1dfc6fa558 s4-param Add hook between Samba3 and Samba4 loadparm systems.
In the top level build, this allows calls to code that requires a
lpcfg_ style loadparm_context, while using the global parameters
loaded from the source3 loadparm code.

Andrew Bartlett
2011-06-06 17:37:51 +10:00
Andrew Bartlett
a18efb1490 s4-param Remove 'sid generator'
This was only used by the Fedora DS backend for Samba4.  We agreed to
no longer support external LDAP backends.

Andrew Bartlett
2011-06-06 17:37:50 +10:00
Andrew Bartlett
834d590bcf s4-param Remove 'idmap database'
This is now just idmap.ldb in the private dir, which remains.
2011-06-06 15:02:39 +10:00
Andrew Bartlett
1565da7694 s4-param Remove 'secrets database' parameter
This is now just secrets.ldb in the private dir, which remains.
2011-06-06 15:02:39 +10:00
Andrew Bartlett
c091a92be5 s4-param Remove 'sam database' parameter
This now just relies on the private dir parameter, which remains.

Andrew Bartlett
2011-06-06 15:02:38 +10:00
Andrew Tridgell
1c87f166df s4-ipv6: changed the default "socket address"
this changes the default socket address to the empty string. This
allows uses to specify 0.0.0.0 meaning to listen only on the IPv4
wildcard address.
2011-06-06 12:26:09 +10:00
Andrew Bartlett
c004a932c4 libcli/util Remove ntstatus_check_dos_mapping
This has been set to true since the global loadparm was removed in
2008, and removes an #ifdef SAMBA_BUILD == 4

Andrew Bartlett
2011-05-31 15:10:20 +10:00
Andrew Bartlett
ac82ac4b83 s4-param cope with doulbe-parsing of -foo and +foo lists
For some reason these lists are parsed twice, and so any -foo was
failing as it was already removed the first time.

Andrew Bartlett
2011-05-08 17:36:25 +02:00
Andrew Bartlett
958368efd0 s4-param Don't set variables such as the debuglevel unless global
This ensures that when a second lp_ctx is created, that it does not
set global variables such as the debug level, log file etc,
potentially overriding the settings created by another context.

In particular this matters when loading Samba4 modules into Samba3.

Andrew Bartlett
2011-05-08 10:56:28 +02:00
Andrew Tridgell
8b2ba64d60 libds: moved enum security_types to a common header
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-05-08 10:56:27 +02:00
Andrew Bartlett
2742ec0e34 Remove strlower_m() and strupper_m() from source4 and common code.
This function is problematic because a string may expand in size when
changed into upper or lower case.  This will then push characters off
the end of the string in the s3 implementation, or panic in the former
s4 implementation.

Andrew Bartlett
2011-05-03 07:37:07 +02:00
Andrew Bartlett
bcd68837ee lib/util Rename conv_str_size() -> conv_str_size_error() 2011-04-30 10:38:25 +02:00
Andrew Bartlett
bc31e9c7d2 s4-param Rename lp_destructor() -> lpcfg_destructor() for consistency 2011-04-29 16:38:15 +10:00
Andrew Bartlett
96136ad656 s4-param Rename unused lp_ functions to match param.h 2011-04-29 16:38:15 +10:00
Andrew Bartlett
7730ab00b5 s4-param Rename volume_label() -> lpcfg_volume_label() 2011-04-29 16:38:15 +10:00
Andrew Bartlett
67905b41a9 s4-param Rename private_path() -> lpcfg_private_path()
This is consistent with lock_path()

Andrew Bartlett
2011-04-29 16:38:14 +10:00
Andrew Tridgell
822e7e5967 s4-loadparm: be a bit less verbose about smb.conf processing
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-04-04 10:30:30 +10:00
Andrew Tridgell
77cc1610e0 s4-param: set a default logfile
setup a logfile for when one is not specified in smb.conf

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-03-29 06:17:03 +02:00
Andrew Bartlett
b5616adc8a lib/util/charset rename iconv_convenience to iconv_handle
This better reflects what this structure is

Andrew Bartlett
2011-03-25 04:37:06 +01:00
Matthias Dieter Wallnöfer
5d09acab7e s4:param/loadparm.c - check for OOM
Return NULL if the loadparm context hasn't been allocated

Reviewed-by: Jelmer
2011-03-22 19:04:49 +01:00
Andrew Bartlett
5f5ca913b7 lib/util: new merged debug system
This is the s3 debug system, with a number of changes to tidy it up
for common use.  The debug class system is simplified by the removal of the
ISSET table, the system no longer attempts to cope with assignment of
DEBUGLEVEL, and the full class table is always available (rather than
just DEBUGLEVEL_CLASS[DBCG_ALL]) from startup.  It is also no longer
confusingly described as a hack, but as the initial table.

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Mar  1 04:32:12 CET 2011 on sn-devel-104
2011-03-01 04:32:12 +01:00
Andrew Bartlett
2a3a86a86f lib/util/charcnv Move iconv handle setup in common
We now use the struct smb_iconv_convenience at the core of all our
iconv code, and use global_iconv_convenience for the callers that
don't specify one.

Andrew Bartlett
2011-02-18 18:41:01 +11:00