Kai Blin [Sun, 8 May 2011 19:50:34 +0000 (21:50 +0200)]
nsswitch: Fix build check logic
Only build pam_winbind.so if we want pam modules _and_ have the libs
Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Sun May 8 23:56:33 CEST 2011 on sn-devel-104
Kamen Mazdrashki [Sun, 8 May 2011 10:31:32 +0000 (13:31 +0300)]
selftest: Polish selftest-vars.sh a little so it can be used again
Autobuild-User: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date: Sun May 8 22:50:01 CEST 2011 on sn-devel-104
Andrew Bartlett [Sun, 8 May 2011 13:26:28 +0000 (15:26 +0200)]
s4-selftest Add tests for proxy_samba4_dc
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun May 8 20:03:45 CEST 2011 on sn-devel-104
Andrew Bartlett [Sun, 8 May 2011 08:32:01 +0000 (10:32 +0200)]
selftest: Make the ncalrpc dir common between Samba4 and Samba3.
This also avoids creating the directory, as the startup routines will
create it with the correct permissions.
Andrew Bartlett
Andrew Bartlett [Sun, 8 May 2011 08:29:27 +0000 (10:29 +0200)]
ncalrpc: Force ncalrpc dir to be mode 755 in all users
This allows this directory to be shared between Samba3 and Samba4 in a
Franky-style setup easily.
Andrew Bartlett
Andrew Bartlett [Sun, 8 May 2011 04:55:33 +0000 (06:55 +0200)]
selftest: Add plugin_s4_dc environment
This environment uses pdb_samba4 and auth_samba4 to plug these
critical subsystems into a mixed Samba3/Samba4 DC, in a similar way to
the 'Franky' proposal.
Andrew Barltett
Andrew Bartlett [Sun, 8 May 2011 12:48:11 +0000 (14:48 +0200)]
s3-auth Add auth_samba4 module
This module makes a direct call into the Samba4 auth stack to
authenticate Samba4 uses in a Samba3 file server. The direct call
avoids the need to obtain schannel credentials.
Andrew Bartlett
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Andrew Bartlett [Fri, 6 May 2011 14:50:04 +0000 (00:50 +1000)]
s3-passdb: added pdb_samba4
This uses direct LDB operations and calls to the dsdb library to allow
passdb operations (such as pdbedit and smbpasswd) offline, and uses
transactions internally for database consistency.
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Andrew Bartlett [Sun, 8 May 2011 10:52:06 +0000 (12:52 +0200)]
s3-passdb Redirect domain GUID and SID queries to the passdb stack
This is done if the passdb module supports PDB_ADS, and ensures that a
random SID is never made up locally for these directories.
This is only enabled when in the waf build, due to dependency issues.
Andrew Bartlett
Andrew Bartlett [Sun, 8 May 2011 13:56:58 +0000 (15:56 +0200)]
s4-dsdb Add transactions to dsdb modify helpers
Andrew Bartlett [Sun, 8 May 2011 13:24:57 +0000 (15:24 +0200)]
s4-samr Remove incorrect transaction_cancel() in error path
The transactions are now handled entirely within dsdb_add_user()
Andrew Bartlett
Andrew Bartlett [Sun, 8 May 2011 04:58:19 +0000 (06:58 +0200)]
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
Andrew Bartlett [Sun, 8 May 2011 15:35:05 +0000 (17:35 +0200)]
build: Allow the C code to know if this is a waf build
This allows addition of functionality that can't be handled (for
example, due to dependencies) in the autoconf build.
Andrew Bartlett
Andrew Tridgell [Sun, 8 May 2011 10:55:41 +0000 (12:55 +0200)]
s4-interfaces: keep interfaces in the order they were declared
the spoolss notify test depends on the interfaces order
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Sun May 8 13:57:58 CEST 2011 on sn-devel-104
Andrew Tridgell [Sun, 8 May 2011 10:55:00 +0000 (12:55 +0200)]
s3-test: build smbtorture with --enable-developer
this makes debugging of tests much easier, as we get debug symbols
Andrew Bartlett [Tue, 3 May 2011 10:24:39 +0000 (20:24 +1000)]
lib/socket: Remove outdated comment
The autoconf and waf tests for interfaces logic are in libreplace now.
Andrew Bartlett [Mon, 2 May 2011 05:57:19 +0000 (15:57 +1000)]
s4-interfaces Rename interfaces code so not to conflict with source3/
The iface_count, iface_n_bcast, and load_interfaces functions
conflicted with functions of the same name in source3, so the source4
functions were renamed. Hopefully we can actually wrap one around the
other in future.
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 02:20:21 +0000 (12:20 +1000)]
s3-lib Use common lib/socket code for get_interfaces() et al
Andrew Bartlett [Mon, 2 May 2011 03:02:17 +0000 (13:02 +1000)]
lib/socket move interfaces code to the top level
Andrew Bartlett [Tue, 3 May 2011 09:41:41 +0000 (19:41 +1000)]
s4-lib/socket Samba4 is not IPv6 compatible
Don't add IPv6 interfaces until we actually support them.
I'll soon have IPv6 service at home, and then I'll make it my buisness
to sort this out once and for all.
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 02:09:19 +0000 (12:09 +1000)]
s4-lib merge get_interfaces() from Samba3 to Samba4
Andrew Tridgell [Mon, 2 May 2011 23:32:01 +0000 (09:32 +1000)]
s3-smbd: expose smbd_set_server_fd()
this allows the fd to be setup by subsystems that want to use the s3
server core code
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun May 8 12:01:13 CEST 2011 on sn-devel-104
Andrew Tridgell [Mon, 2 May 2011 23:33:17 +0000 (09:33 +1000)]
s3-waf: expose the server_exit code in the smbd_base library
these functions are called from the rest of smbd_base
Andrew Tridgell [Fri, 6 May 2011 14:49:13 +0000 (00:49 +1000)]
build: allow s3 libraries to be built with no undefined symbols
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Sun, 8 May 2011 08:30:36 +0000 (10:30 +0200)]
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
Andrew Bartlett [Sun, 8 May 2011 08:28:03 +0000 (10:28 +0200)]
Improve debug messages when creating socket directories
This makes clear what the permissions error and directory name actually is
Andrew Bartlett
Andrew Tridgell [Sat, 7 May 2011 11:32:20 +0000 (13:32 +0200)]
libds: moved enum security_types to a common header
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Sun, 8 May 2011 04:56:47 +0000 (06:56 +0200)]
s3-utils Set dyn_CONFIGFILE from -c on smbpasswd command line
This is similar to the code in popt_common and allows the smb.conf to
be re-loaded from this file later in the code (or for Samba4 plugins
to attempt to parse the same smb.conf).
Andrew Bartlett
Andrew Bartlett [Sun, 8 May 2011 04:54:50 +0000 (06:54 +0200)]
selftest Use die() less often, as it fails to allow cleanup
Andrew Bartlett [Sat, 7 May 2011 06:36:06 +0000 (08:36 +0200)]
auth: allow auth_common.h to be included multiple times without error
Andrew Bartlett [Sat, 7 May 2011 06:14:06 +0000 (08:14 +0200)]
s4-auth Rename auth -> auth4 to avoid conflict with s3 auth
Andrew Bartlett [Sat, 7 May 2011 06:12:54 +0000 (08:12 +0200)]
s4-ntvfs: Rename brl_*() -> brlock_*() to avoid conflict with brlock_init in s3
Andrew Tridgell [Fri, 6 May 2011 14:49:38 +0000 (00:49 +1000)]
s4-auth: remove unused prototype
Volker Lendecke [Sat, 7 May 2011 08:38:12 +0000 (10:38 +0200)]
s3: Fix including libsmb/proto.h without prior ads.h
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat May 7 11:38:11 CEST 2011 on sn-devel-104
Gordon Ross [Fri, 6 May 2011 23:00:08 +0000 (16:00 -0700)]
Fix Samba3 on OpenIndiana.
I'd like Samba to use the native OpenLDAP and MIT Kerberos libs.
Attached are some patches to do that. (relative to git master)
It does not build for me without these.
(OpenIndiana is an off-shoot of OpenSolaris See http://www.openindiana.org)
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat May 7 02:20:14 CEST 2011 on sn-devel-104
Jeremy Allison [Fri, 6 May 2011 14:54:18 +0000 (07:54 -0700)]
A couple more off-by-one calculations with strlcpy.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri May 6 18:39:17 CEST 2011 on sn-devel-104
Günther Deschner [Fri, 6 May 2011 14:22:41 +0000 (16:22 +0200)]
s4-smbd: fix randseed_init() usage.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri May 6 17:37:11 CEST 2011 on sn-devel-104
Günther Deschner [Fri, 6 May 2011 10:54:59 +0000 (12:54 +0200)]
s3-includes: no need to globally include libads/ads_status.h.
Guenther
Günther Deschner [Fri, 6 May 2011 10:53:38 +0000 (12:53 +0200)]
s3-includes: finally only include client.h when libsmb is used.
Guenther
Günther Deschner [Fri, 6 May 2011 09:47:43 +0000 (11:47 +0200)]
s3-libsmb: move protos to libsmb/proto.h
Guenther
Günther Deschner [Fri, 6 May 2011 12:03:00 +0000 (14:03 +0200)]
s3-proto: remove some duplicate prototypes.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri May 6 16:21:08 CEST 2011 on sn-devel-104
Günther Deschner [Thu, 5 May 2011 19:52:57 +0000 (21:52 +0200)]
s3-spoolss: remove unused struct in construct_notify_printer_info().
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri May 6 12:07:17 CEST 2011 on sn-devel-104
Günther Deschner [Thu, 5 May 2011 10:52:29 +0000 (12:52 +0200)]
libcli/security: fix build warning, cr_descr_log_acl() is not used currently.
Guenther
Günther Deschner [Thu, 5 May 2011 10:52:05 +0000 (12:52 +0200)]
tdb: fix a build warning.
Guenther
Günther Deschner [Thu, 5 May 2011 09:25:29 +0000 (11:25 +0200)]
s3: only include tdb headers where needed.
Guenther
Andrew Bartlett [Wed, 4 May 2011 11:20:57 +0000 (21:20 +1000)]
lib/util don't use enum protocol_types in ms_fnmatch_protocol
This makes it easier to compile this in the top level with s3 and s4
headers.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri May 6 08:50:52 CEST 2011 on sn-devel-104
Andrew Bartlett [Wed, 4 May 2011 11:19:46 +0000 (21:19 +1000)]
libcli/smb Move cifs posix helper functions and headers in common
unix_perms_to_wire() was a duplicate symbol in the top level build.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 10:57:12 +0000 (20:57 +1000)]
lib/util Use lib/util/ms_fnmatch.c in common for gen_fnmatch()
gen_fnmatch was a duplicate symbol in the top level build.
gen_fnmatch() used for simple non-CIFS pattern matching, so selecting
the lib/util implementation should not be a concern.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 10:53:33 +0000 (20:53 +1000)]
lib/util Rename ms_fnmatch() to ms_fnmatch_protocol() to avoid dup symbol
This verison of the function takes a protcol as argument to determine
matching rules.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 07:00:23 +0000 (17:00 +1000)]
errors: Remove unused unix_to_werror()
Andrew Bartlett [Wed, 4 May 2011 05:50:07 +0000 (15:50 +1000)]
libcli/util Move NTSTATUS table to the top level
Andrew Bartlett [Wed, 4 May 2011 05:30:01 +0000 (15:30 +1000)]
nterr: Add mem_ctx for return string from get_nt_error_c_code()
It is clearer to avoid the implicit return on talloc_tos()
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 06:16:13 +0000 (16:16 +1000)]
s3-smbd ntstatus_to_dos() pulls the DOS error codes out internally
This means we don't need to duplicate that logic here.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 03:59:57 +0000 (13:59 +1000)]
libcli/util Merge ntstatus_to_dos() ntstatus_to_werror() to the top level
This takes the Samba4 version, with the NT_STATUS_IS_DOS() check.
This will be used in smbd/error.c shortly.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 06:51:23 +0000 (16:51 +1000)]
errors: Merge source3/ werror_to_ntstatus() code to source4/
Andrew Bartlett [Wed, 4 May 2011 03:47:26 +0000 (13:47 +1000)]
errors: Merge ntstatus -> DOS error table between Samba3 and Samba4.
They are now identical
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 01:39:21 +0000 (11:39 +1000)]
s3-lib Remove unused dos error codes from errmap_unix
This also makes unix_nt_errmap private to errmap_unix.c and errormap.c
so the tables themselves cannot be duplicate symbols until merged.
Andrew Bartlett
Andrew Bartlett [Wed, 4 May 2011 00:28:15 +0000 (10:28 +1000)]
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
Andrew Tridgell [Fri, 6 May 2011 04:49:36 +0000 (14:49 +1000)]
s3-winbind: another strlcpy()/fstring fix
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri May 6 07:50:33 CEST 2011 on sn-devel-104
Andrew Tridgell [Fri, 6 May 2011 04:00:27 +0000 (14:00 +1000)]
s3-auth: fixed bug with usernames longer than sizeof(char *)
using sizeof(user) when user is "fstring user" as a C parameter
actually returns sizeof(char *), which means that long usernames
aren't allowed.
Jeremy, you need a longer username :-)
Cheers, Tridge
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Jeremy Allison [Thu, 5 May 2011 23:44:27 +0000 (16:44 -0700)]
Fix const in smbtorture.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri May 6 02:45:00 CEST 2011 on sn-devel-104
Jeremy Allison [Thu, 5 May 2011 23:32:01 +0000 (16:32 -0700)]
Fix broken interface to set_namearray() - don't modify incoming string.
Jeremy Allison [Thu, 5 May 2011 23:31:41 +0000 (16:31 -0700)]
Fixup use of const.
Jeremy Allison [Thu, 5 May 2011 23:19:49 +0000 (16:19 -0700)]
More const fixes. Remove CONST_DISCARD.
Jeremy Allison [Thu, 5 May 2011 23:19:23 +0000 (16:19 -0700)]
Change the char * pointers in the struct to const char * (which is how they're treated).
Jeremy Allison [Thu, 5 May 2011 21:56:30 +0000 (14:56 -0700)]
More const fixes... getting near the end now.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri May 6 00:57:00 CEST 2011 on sn-devel-104
Jeremy Allison [Thu, 5 May 2011 21:36:55 +0000 (14:36 -0700)]
More simple const fixups.
Jeremy Allison [Thu, 5 May 2011 21:22:11 +0000 (14:22 -0700)]
More simple const fixes.
Jeremy Allison [Thu, 5 May 2011 20:42:05 +0000 (13:42 -0700)]
More const fixes for compiler warnings from the waf build.
Jeremy Allison [Thu, 5 May 2011 18:38:06 +0000 (11:38 -0700)]
Fixup build without --with-aio.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu May 5 21:38:23 CEST 2011 on sn-devel-104
Jeremy Allison [Thu, 5 May 2011 18:29:01 +0000 (11:29 -0700)]
More const compiler warning fixes.
Jeremy Allison [Thu, 5 May 2011 17:41:59 +0000 (10:41 -0700)]
Fix many const compiler warnings.
Jeremy Allison [Thu, 5 May 2011 17:41:40 +0000 (10:41 -0700)]
Don't reuse a non-const pointer when manipulating const.
Volker Lendecke [Thu, 5 May 2011 13:09:09 +0000 (15:09 +0200)]
s3: Fix a typo
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu May 5 16:10:35 CEST 2011 on sn-devel-104
Volker Lendecke [Thu, 5 May 2011 10:17:41 +0000 (12:17 +0200)]
s3: Fix dup_smb2_vec3
Metze, Jeremy, please check!
Thanks,
Volker
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu May 5 13:39:40 CEST 2011 on sn-devel-104
Andrew Tridgell [Thu, 5 May 2011 03:59:08 +0000 (13:59 +1000)]
s4-auth: removed the password combinations code in auth_unix
this code never did anything due to a typo, and was untested. We
should not be inluding a password cracker in Samba anyway.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu May 5 07:00:14 CEST 2011 on sn-devel-104
Günther Deschner [Wed, 4 May 2011 22:58:27 +0000 (00:58 +0200)]
s3-rpc_server: run minimal_includes.pl.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu May 5 03:04:38 CEST 2011 on sn-devel-104
Günther Deschner [Wed, 4 May 2011 22:54:56 +0000 (00:54 +0200)]
s3-rpc_client: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:51:12 +0000 (00:51 +0200)]
s3-rpcclient: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:48:26 +0000 (00:48 +0200)]
s3-printing: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:36:51 +0000 (00:36 +0200)]
s3-param: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:31:42 +0000 (00:31 +0200)]
s3-libsmb: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:25:31 +0000 (00:25 +0200)]
s3-libnet: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:22:05 +0000 (00:22 +0200)]
s3-libads: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:10:23 +0000 (00:10 +0200)]
s3-lib: run minimal_includes.pl.
Guenther
Günther Deschner [Wed, 4 May 2011 22:03:48 +0000 (00:03 +0200)]
s3-auth: run minimal_includes.pl
Guenther
Matthieu Patou [Mon, 21 Mar 2011 15:03:50 +0000 (18:03 +0300)]
s4-samba-tool: allow specification of targetdir when joining as (RO)DC
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Thu May 5 02:04:13 CEST 2011 on sn-devel-104
Jeremy Allison [Wed, 4 May 2011 21:57:37 +0000 (14:57 -0700)]
Clean up some const and other compiler warnings.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu May 5 00:59:40 CEST 2011 on sn-devel-104
Jeremy Allison [Tue, 3 May 2011 23:43:27 +0000 (16:43 -0700)]
I added them, so I get to kill them :-). Finally remove all uses of safe_strcpy and safe_strcat. Change to strlcpy, strlcat.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed May 4 22:14:14 CEST 2011 on sn-devel-104
Jeremy Allison [Wed, 4 May 2011 18:38:26 +0000 (11:38 -0700)]
Fix warning messages caused by addition of null check in fstrcpy macro.
Jeremy Allison [Tue, 3 May 2011 23:42:17 +0000 (16:42 -0700)]
Tidy up some missing checks for NULL in strlcpy.
Jeremy Allison [Tue, 3 May 2011 21:52:01 +0000 (14:52 -0700)]
Add in bufflen limit when storing NetBIOS names. Remove safe_strcpy.
Jeremy Allison [Tue, 3 May 2011 21:51:25 +0000 (14:51 -0700)]
Convert safe_strXX to strlXXX. Clean up off-by-ones.
Jeremy Allison [Tue, 3 May 2011 21:08:27 +0000 (14:08 -0700)]
Remove magic numbers. Standardize on macro. Move from safe_strcat to strlcat.
Jeremy Allison [Tue, 3 May 2011 21:06:32 +0000 (14:06 -0700)]
Cope with +1 change on moving from safe_strcat to strlcat.
Jeremy Allison [Tue, 3 May 2011 21:15:04 +0000 (14:15 -0700)]
Fold null terminator into listlen length, change to strlcpy.
Jeremy Allison [Tue, 3 May 2011 21:01:20 +0000 (14:01 -0700)]
Fix the only place we reply on the NULL handling for the source in safe_strcpy.
Jeremy Allison [Tue, 3 May 2011 20:57:30 +0000 (13:57 -0700)]
Fix off-by-one when used with safe_strcpy.
Jeremy Allison [Tue, 3 May 2011 20:53:30 +0000 (13:53 -0700)]
sasl_secret_t ends in a char [1] size. This means the extra character is implicit in the safe_strcpy. When changing to strlcpy ensure we allocate an extra char for it. This fixes a bug where secret->len+1 used with safe_strcpy could actually write into secret->len+2.
Jeremy Allison [Tue, 3 May 2011 20:52:06 +0000 (13:52 -0700)]
Simple +1 changes in hardcoded lengths when changing from safe_strcpy to strlcpy.