1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00

671 Commits

Author SHA1 Message Date
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
907cdb5de7 s4-modules Remove lp_ctx from init functions that no longer need it
Now that we don't allow the smb.conf to change the modules dir, many
functions that simply load modules or initialise a subsytem that may
load modules no longer need an lp_ctx.

Andrew Bartlett
2011-06-06 17:37:51 +10: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
de46ad9084 lib/util use modules_path(), data_path() and shlib_ext() from source3
This brings these helpful utility functions in common, as they are not
based on either loadparm system.

(The 'modules dir' parameter from Samba4 will shortly be removed, so
there is no loss in functionality)

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
521687be0d s4-param make lpcfg_sam_name() cope with PDC and BDC roles
These roles (ROLE_DOMAIN_CONTROLLER is ROLE_DOMAIN_BDC) will come in
from the s3 loadparm.

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
1475013963 lib/util Move source3 tdb_wrap_open() into the common code.
This #if _SAMBA_BUILD == 3 is very unfortunate, as it means that in
the top level build, these options are not available for these
databases.  However, having two different tdb_wrap lists is a worse
fate, so this will do for now.

Andrew Bartlett
2011-05-06 07:51:24 +02:00
Andrew Bartlett
56a5b7d09e s4-param Rename secrets_init() -> randseed_init()
This only sets up the random number generator callback these days, so
use a different database for that.

(All secrets data in Samba4 is in secrets.ldb)

Andrew Bartlett
2011-05-03 07:37:07 +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 Tridgell
39081a20c5 s4-param: use new roles.h
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-05-03 07:37:07 +02:00
Andrew Bartlett
cdd802af83 s4-messaging Rename messaging -> imessaging
This avoid symbol and structure conflicts between Samba3 and Samba4,
and chooses a less generic name.

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 Bartlett
dbbc6e9dda s4-param Remove config_path() -> lpcfg_config_path()
This is consistent with lock_path()

Andrew Bartlett
2011-04-29 16:38:14 +10:00
Andrew Bartlett
209d47c100 s4-param Rename lock_path() -> lpcfg_lock_path()
This avoids a conflict with the source3/ lock_path()
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
3940777a14 s4:python bindings - handle NULL returns from "loadparm_init_global"
Reviewed-by: Jelmer

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Mar 22 19:52:57 CET 2011 on sn-devel-104
2011-03-22 19:52:57 +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
Jelmer Vernooij
42eb3ab54d source4/param: Fix prototypes for all functions. 2011-03-19 03:20:05 +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
Jelmer Vernooij
9652cceb08 Make lpcfg_server_role public.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Feb 23 00:44:16 CET 2011 on sn-devel-104
2011-02-23 00:44:15 +01:00
Andrew Tridgell
7634fb6393 s4-waf: rename 'param' to 'pyparam'
we will use 'param' for the s3 libparam.so

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-22 02:51:09 +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
Matthieu Patou
05ad9d2be4 s4: load the backupkey endpoint
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-02-14 10:57:43 +11:00
Andrew Tridgell
8dc92c8f71 ldb: use #include <ldb.h> for ldb
thi ensures we are using the header corresponding to the version of
ldb we're linking against. Otherwise we could use the system ldb for
link and the in-tree one for include

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-10 06:51:07 +01:00
Jelmer Vernooij
a65eedd0c7 provision: Add missing dependency on pyldb-util.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Feb  9 13:55:10 CET 2011 on sn-devel-104
2011-02-09 13:55:10 +01:00
Andrew Bartlett
15d0166340 s4-python Don't force "bin" into the python sys.path
This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is
now set properly at all times, incluidng for installed and
build-directory binaries.  So we don't need to make assumptions about
bin being magic any more.

Andrew Bartlett
2011-02-07 13:22:02 +11:00
Andrew Bartlett
d1e5a73806 s4-provision Remove setup_path, setup_dir and find_setup_dir
We now have a reliable way to know the current location of the
templates: dyn_SETUPDIR, which is updated for both the in-build and
installed binaries.

This replaces the function arguments and the distributed resolution of
the setup directory with one 'global' function (imported as required).

This also removes the ability to specify an alternate setup directory
on the command line, as this was rarely if ever used and never tested.

Andrew Bartlett
2011-02-07 13:22:01 +11:00