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.
Jeremy Allison [Tue, 3 May 2011 20:49:28 +0000 (13:49 -0700)]
BUGFIX when converting from safe_strcpy to strlcpy.
We must have a blob legth > 0 in order to safely copy
the (possibly) 16 bytes + 1 byte zero character safely.
Jeremy Allison [Tue, 3 May 2011 20:40:07 +0000 (13:40 -0700)]
Remove overmalloc_safe_strcpy - can be simple strlcpy.
Jeremy Allison [Tue, 3 May 2011 20:19:27 +0000 (13:19 -0700)]
Remove obvious use of safe_strcpy + safe_strcat -> strlcpy + strlcat.
Jeremy Allison [Tue, 3 May 2011 20:14:46 +0000 (13:14 -0700)]
Change safe_strcpy_base to strlcpy_base. Note the size doesn't change here as the original macro auto-added the -1.
Jeremy Allison [Tue, 3 May 2011 20:10:01 +0000 (13:10 -0700)]
Fix simple uses of safe_strcpy -> strlcpy. Easy ones where we just remove -1.
Volker Lendecke [Wed, 4 May 2011 15:45:34 +0000 (17:45 +0200)]
s3-torture: Add a test for notify upon read&x
This makes sure that when a file is brought online by a read call
we notify the client for FILE_NOTIFY_CHANGE_ATTRIBUTES.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed May 4 21:09:22 CEST 2011 on sn-devel-104
Volker Lendecke [Wed, 4 May 2011 15:48:12 +0000 (17:48 +0200)]
Always build before commit ... :-)
Jeremy Allison [Tue, 3 May 2011 19:55:42 +0000 (12:55 -0700)]
Remove unused function parse_add_domuser().
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed May 4 20:05:42 CEST 2011 on sn-devel-104
Günther Deschner [Wed, 4 May 2011 16:01:04 +0000 (18:01 +0200)]
s3-waf: add vfs_gpfs_hsm_notify to the build.
Volker, can you please check this is correct ?
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed May 4 19:03:45 CEST 2011 on sn-devel-104
Volker Lendecke [Wed, 4 May 2011 14:02:15 +0000 (16:02 +0200)]
RHEL-CTDB: Build vfs_gpfs_hsm_notify
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed May 4 17:12:14 CEST 2011 on sn-devel-104
Volker Lendecke [Wed, 4 May 2011 13:48:27 +0000 (15:48 +0200)]
vfs_gpfs: Properly notify the offline->online changes
This needs to be a separate module that cooperates with vfs_gpfs. If aio_fork
is used early in the module chain it (correctly) does not propagate the aio ops
down, so vfs_gpfs does not see them. This slim module must come early in the
chain for notifies to work properly.
Volker Lendecke [Wed, 4 May 2011 13:47:42 +0000 (15:47 +0200)]
vfs_gpfs: Block sendfile for offline files
Volker Lendecke [Wed, 4 May 2011 13:42:54 +0000 (15:42 +0200)]
vfs_gpfs: Store the winattrs in st.vfs_private
This avoids a considerable amount of gpfs_winattr calls
Volker Lendecke [Wed, 4 May 2011 10:11:04 +0000 (12:11 +0200)]
s3: Properly deal with exited winbind children
When a winbind child exits, we need to immediately close the socket. If not,
the next request to that child will be sent to a socket without a listener,
leading to a failed request. This failed request will then trigger a proper
re-init.
This patch avoids the one failed request.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed May 4 13:32:16 CEST 2011 on sn-devel-104
Günther Deschner [Tue, 3 May 2011 19:42:04 +0000 (21:42 +0200)]
s3-vfs: make vfswrap_llistxattr and vfswrap_flistxattr static.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed May 4 12:31:10 CEST 2011 on sn-devel-104
Volker Lendecke [Tue, 3 May 2011 19:28:37 +0000 (21:28 +0200)]
s3: Filter out duplicates in name_query()
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed May 4 00:03:47 CEST 2011 on sn-devel-104
Günther Deschner [Tue, 3 May 2011 14:28:44 +0000 (16:28 +0200)]
s3-includes: when MADVISE support was reverted back in 2009, someone forgot this hunk.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue May 3 22:06:20 CEST 2011 on sn-devel-104
Günther Deschner [Tue, 3 May 2011 14:25:20 +0000 (16:25 +0200)]
s3-includes: move enum flush_reason_enum to smb.h
Guenther
Günther Deschner [Tue, 3 May 2011 14:16:50 +0000 (16:16 +0200)]
s3-includes: remove ipv6 related prototype which is already defined in ../lib/util/util_net.h.
Guenther
Günther Deschner [Tue, 3 May 2011 12:45:47 +0000 (14:45 +0200)]
s3-system: move LOCK_ defines to lib/system.c
Guenther
Volker Lendecke [Tue, 3 May 2011 15:04:06 +0000 (17:04 +0200)]
s3: Handle EINTR from sys_poll correctly
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue May 3 18:06:48 CEST 2011 on sn-devel-104
Günther Deschner [Tue, 3 May 2011 10:05:47 +0000 (12:05 +0200)]
s3-proto: move remaining krb5 protos to krb5_protos.h
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue May 3 15:38:40 CEST 2011 on sn-devel-104
Andrew Bartlett [Tue, 3 May 2011 09:11:38 +0000 (19:11 +1000)]
s3-ctdb Fix duplicate function name due to packet -> ctdb_packet rename.
Signed-off-by: Günther Deschner <gd@samba.org>
Björn Jacke [Wed, 20 Apr 2011 22:11:21 +0000 (00:11 +0200)]
s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue May 3 13:04:11 CEST 2011 on sn-devel-104
Björn Jacke [Wed, 20 Apr 2011 21:40:30 +0000 (23:40 +0200)]
ѕ3/configure: move out generic CPPFLAGS in the solaris case here
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Björn Jacke [Wed, 20 Apr 2011 21:32:12 +0000 (23:32 +0200)]
ѕ3/configure: move out generic LDFLAGS in the solaris case here
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 3 May 2011 05:35:18 +0000 (15:35 +1000)]
lib/util make string_wrappers.h a public header
This isn't a very good public header, but util.h includes it, so we
don't have much choice in the short term.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue May 3 08:37:22 CEST 2011 on sn-devel-104
Andrew Bartlett [Tue, 3 May 2011 03:24:10 +0000 (13:24 +1000)]
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
Andrew Bartlett [Tue, 3 May 2011 02:59:36 +0000 (12:59 +1000)]
lib/util Use lib/util/util_str.c in common, including strequal()
strequal() is now implemented in terms of strcasecmp_m() which is
tested in smbtorture and which does not talloc() for ASCII or
non-ASCII comparions, and has an ASCII fast-path.
Andrew Bartlett
Andrew Bartlett [Tue, 3 May 2011 05:23:19 +0000 (15:23 +1000)]
lib/util Use compiler-checked safe string macros in top level code.
This brings the 'safe' macros to the top level code, and removes
duplication of the safe_strcpy() and safe_strcat() functions.
Andrew Bartlett
Andrew Bartlett [Tue, 3 May 2011 05:33:31 +0000 (15:33 +1000)]
s4: fix arguments to safe_strcpy()
Found by the s3-derivied safe_strcpy() macro.
Andrew Bartlett
Andrew Tridgell [Mon, 2 May 2011 23:34:06 +0000 (09:34 +1000)]
s4-socket: rename allow_access() to socket_allow_access()
this prevents a symbol collision with s3
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Tue, 3 May 2011 02:29:12 +0000 (12:29 +1000)]
lib/util/charset Use push_string and talloc_strupper/strlower from common code
The only caller of push_string() (not to be confused with
push_string_check()) in the common code was encode_pw_buffer(), and it
didn't use the alignment or STR_UPPER flags.
The talloc_strupper() and talloc_strlower() functions are tested in
smbtorture, and are next_codepoint() based.
Andrew Bartlett
Andrew Bartlett [Tue, 3 May 2011 02:25:29 +0000 (12:25 +1000)]
s3-lib make push_ucs2() static
Andrew Bartlett [Tue, 3 May 2011 02:16:16 +0000 (12:16 +1000)]
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
Andrew Tridgell [Mon, 2 May 2011 02:05:13 +0000 (12:05 +1000)]
s4-param: use new roles.h
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Tridgell [Mon, 2 May 2011 02:05:02 +0000 (12:05 +1000)]
s3-include: use new roles.h
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Tridgell [Mon, 2 May 2011 02:04:32 +0000 (12:04 +1000)]
libds: added roles.h for server roles
this will allow us to move the server roles in common, which will
make it much easier to mix s3/s4 calls in the one C file
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Tridgell [Mon, 2 May 2011 01:34:57 +0000 (11:34 +1000)]
libcli/raw: use a different ifdef than s3 smb.h
this allows both headers to be included in 1 C file
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Tue, 3 May 2011 00:40:33 +0000 (10:40 +1000)]
s4-messaging Rename messaging -> imessaging
This avoid symbol and structure conflicts between Samba3 and Samba4,
and chooses a less generic name.
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 06:36:48 +0000 (16:36 +1000)]
s4-libcli Remove resolve_name() as it conflicts with Samba3.
This was just a wrapper around resolve_name_ex(), so just call that
instead.
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 06:36:21 +0000 (16:36 +1000)]
s4-torture Remove unused and uncompleated test
Andrew Bartlett [Mon, 2 May 2011 06:23:40 +0000 (16:23 +1000)]
lib/util Move set_socket_options() into common code.
Andrew Bartlett [Mon, 2 May 2011 06:15:50 +0000 (16:15 +1000)]
s4-lib/socket Merge updated set_socket_options from Samba3 -> Samba4
Andrew Bartlett [Mon, 2 May 2011 05:23:08 +0000 (15:23 +1000)]
lib/util Move more network utility functions from source3 into lib/util
This will help with the merge of the interfaces layer.
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 01:38:41 +0000 (11:38 +1000)]
s3-ctdb Rename packet file and files to ctdb_packet
This avoids a conflicts with the Samba4 packet.c, as these is only
used in CTDB
Andrew Bartlett
Andrew Bartlett [Mon, 2 May 2011 00:53:18 +0000 (10:53 +1000)]
s4-cluster Rename server_id.node -> vnn to match Samba3