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

76713 Commits

Author SHA1 Message Date
Stefan Metzmacher
b0480f26ca s4:lib/stream: make use of smb_len_tcp()
metze
2011-10-19 15:44:29 +02:00
Stefan Metzmacher
da32fb6b40 s3:include: use smb_[set]len_[nbt|tcp]() macros
metze
2011-10-19 15:44:29 +02:00
Stefan Metzmacher
cd22763440 libcli/smb: add smb_[set]len_[nbt|tcp]() macros
metze
2011-10-19 15:44:29 +02:00
David Disseldorp
5e6c477ef8 s3: remove duplicate fsctl fn definitions
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-19 15:44:29 +02:00
David Disseldorp
b711de287f libcli: Move smb2 fsctl fn defs into common code
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-19 15:44:29 +02:00
David Disseldorp
d5ea379428 s3: Remove duplicate fsctl function definitions
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-19 15:44:29 +02:00
David Disseldorp
281fc93c6b libcli: move ioctl function field defs to smb_constants
Currently there are a lot of duplicate ioctl function field definitions
between source3 and source4.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-19 15:44:29 +02:00
Andrew Bartlett
43f23b55c4 s4-s3-upgrade rename samba-tool domain samba3upgrade --libdir to --dbdir for clarity
The things pointed at are not typically in a directory called lib,
so avoid confusing our administrators.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Oct 19 15:43:04 CEST 2011 on sn-devel-104
2011-10-19 15:43:04 +02:00
Andrew Bartlett
be9378e41e s4-s3-upgrade fix format string for secrets.tdb exception 2011-10-19 14:13:09 +02:00
Andrew Bartlett
036b23a106 s4-s3-upgrade test upgrade without a wins.dat 2011-10-19 14:13:09 +02:00
Andrew Bartlett
596d6cceab s4-s3-upgrade Fix samba3upgrade code to cope with a missing wins.dat 2011-10-19 14:13:09 +02:00
Andrew Bartlett
75689effdf s4-smb_server do not set credentials on gensec twice
The samba_server_gensec_start() has already set the credentials
on the gensec_security context.

Andrew Bartlett
2011-10-19 14:13:08 +02:00
Andrew Tridgell
5c5fc5dde4 build: added deletion of stale .so and .o files
when we change our build rules to move a C file, we need to remove the
old ('stale') .so and .o files from the build directory, or they may
be used as part of the new build, which means that old code will be
linked in.

This expands the list of stale files that we remove on rule changes to
include .so and .o files

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Oct 19 09:02:23 CEST 2011 on sn-devel-104
2011-10-19 09:02:23 +02:00
Jelmer Vernooij
416bf1c677 samba.getopt: Add some basic tests.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Oct 19 05:04:33 CEST 2011 on sn-devel-104
2011-10-19 05:04:33 +02:00
Jelmer Vernooij
aa7240e6cf samba.getopt: Keep exception message when setting a lp option fails. 2011-10-19 03:34:07 +02:00
Giampaolo Lauria
eb388cddac samba-tool: Improve getopt.py error handling
Modified code to handle -k and --kerberos options to:
1. Throw the correct exception
2. On error, display the correct user's specified option
2011-10-19 03:34:07 +02:00
Giampaolo Lauria
20f2034f38 samba-tool: Improve getopt.py error handling
Throw an exception when the --option value is invalid
2011-10-19 03:34:07 +02:00
Giampaolo Lauria
8dbf79941f samba-tool: Improve getopt.py error handling
Throw an exception when --option value is not in the form "a=b"
2011-10-19 03:34:07 +02:00
Giampaolo Lauria
0c342f8986 samba-tool: Improve getopt.py error handling
Raise exception when -d or --debuglevel value is <0
2011-10-19 03:34:07 +02:00
Günther Deschner
e1d2b47693 s3-docs: Add a clarification note for nss_info primary group membership calculation.
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Oct 19 03:10:40 CEST 2011 on sn-devel-104
2011-10-19 03:10:40 +02:00
Günther Deschner
5543e6c8e5 s3-docs: Document Services for Unix 2.0 (sfu20) nss_info ldap schema support.
Guenther
2011-10-19 01:40:40 +02:00
Volker Lendecke
fbf1748984 s3: Avoid a winbind 100% cpu loop
When a DC goes down hard, winbind can end up in a 100% CPU loop. The next
(small) RPC request to the DC ends up as a trans2 request. If the connection
goes down, we end up trying to discard the request via the loop in
cli_state_notify_pending(). Because this is a trans2 request,
cli_smb_req_unset_pending will not kick in. Thus the pending array will always
remain at length 1.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Oct 19 01:39:35 CEST 2011 on sn-devel-104
2011-10-19 01:39:35 +02:00
Jeremy Allison
8d54bdb5e1 vfs_netatalk should be using strstr_m, not strstr to find .AppleDouble paths.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 19 00:05:45 CEST 2011 on sn-devel-104
2011-10-19 00:05:45 +02:00
Jeremy Allison
f5ae41d823 The last argument to atalk_build_paths() is always false, remove it. 2011-10-18 22:33:47 +02:00
Michael Adam
47aa9ed82f lib/util: skip single hex digit at the end of the input sting - fix potential segfault
The second of two digits was read without checking for the length of the input
string. For a non-zero-terminated input string, this might have caused a
segfault.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Tue Oct 18 22:32:59 CEST 2011 on sn-devel-104
2011-10-18 22:32:59 +02:00
Michael Adam
cb47890cf2 lib/util: fix function header comment to strhex_to_str()
The description did not match the function's behaviour.
2011-10-18 20:58:26 +02:00
Michael Adam
5d91a2680e lib/util: untangle assignent from check in strhex_to_str() 2011-10-18 20:58:26 +02:00
Björn Baumbach
196fd14788 s3-util: dbwrap_tool: add fetch fuctions for hex and string
Signed-off-by: Michael Adam <obnox@samba.org>
2011-10-18 20:58:26 +02:00
Björn Baumbach
140b5d790a s3-util: dbwrap_tool: add store hex function
Allows the user to store hex blobs in a tdb.

Signed-off-by: Michael Adam <obnox@samba.org>
2011-10-18 20:58:26 +02:00
Michael Adam
4874e1f5b3 selftest:Samba3: fix signature for check_or_start() 2011-10-18 20:58:26 +02:00
Michael Adam
dd6b413a57 selftest:Samba3: fix a message printed when starting winbindd 2011-10-18 20:58:26 +02:00
Simo Sorce
605d7d965a pdb-interface: Do not use unid_t here
This interface needs to be publicly available, unid_t here is not really useful
and makes it harder to use it as unid_t is not a public union.

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Tue Oct 18 20:57:16 CEST 2011 on sn-devel-104
2011-10-18 20:57:16 +02:00
Andrew Bartlett
94799db9b5 s3-auth move the s3 auth context onto gensec_ntlmssp once we start
We do not need it on the auth_ntlmssp_state any longer.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 18 13:54:36 CEST 2011 on sn-devel-104
2011-10-18 13:54:36 +02:00
Andrew Bartlett
fa1275610b s3-libsmb Use a gensec module to provide the ntlmssp client in ntlmssp_wrap.c
This removes the need to have if (ans->gensec_security) everywhere.

Andrew Bartlett
2011-10-18 12:25:30 +02:00
Andrew Bartlett
f9b042641f s3-ntlmssp split auth_ntlmssp_client_start() into two parts
This will allow it to be a wrapper around a gensec module, which
requires that they options be set on a context, but before the
mechanism is started.

This also simplfies the callers, by moving the lp_*() calls
into one place.

Andrew Bartlett
2011-10-18 12:25:30 +02:00
Andrew Bartlett
f3333bdade s3-rpc_client remove cli_auth_ntlmssp_data_destructor
This can be an ordinary talloc child without causing any problem.

This seems to have been inherited from a time when ntlmssp_client_start()
returned malloc() based memory.

Andrew Bartlett
2011-10-18 12:25:30 +02:00
Björn Jacke
56328a4d61 s3/doc: add man page for aio_fork vfs module
thanks to Volker for the content

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue Oct 18 12:24:35 CEST 2011 on sn-devel-104
2011-10-18 12:24:35 +02:00
Stefan Metzmacher
9b407ee6d5 s4:auth/unix_token: match s3 behavior and add uid/gid to the groups array
If mappings use ID_TYPE_BOTH.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Oct 18 10:39:54 CEST 2011 on sn-devel-104
2011-10-18 10:39:54 +02:00
Andrew Bartlett
5954a37997 lib/param: Remove parameters for wins and spoolss databases
This removes the smb.conf parameters per-database, replacing these
with hard-coded database names in well known (and configurable)
directories.

The wins.ldb is now always in the "state dir", rather than being in
both state and lock dir (ie, a bug).

Less smb.conf parameters means less parameters to try and sync up
between the loadparm subsystems.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 18 05:39:54 CEST 2011 on sn-devel-104
2011-10-18 05:39:54 +02:00
Andrew Bartlett
9d49945ff0 ldb: Output more error information when a connect fails 2011-10-18 13:13:34 +11:00
Stefan Metzmacher
94fbe2e4bd s3:auth_util: add the uid with WBC_ID_TYPE_BOTH also to the group array
This will help with having "sidHistory" support in future.

metze
2011-10-18 13:13:33 +11:00
Andrew Bartlett
9068a3080b s3-auth: use typedefs in auth.h
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:33 +11:00
Andrew Bartlett
e7d5f0a357 gensec: move event context from gensec_*_init() to gensec_update()
This avoids keeping the event context around on a the gensec_security
context structure long term.

In the Samba3 server, the event context we either supply is a NULL
pointer as no server-side modules currently use the event context.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:33 +11:00
Andrew Bartlett
0f2b27e7d4 s3-auth fix comment after s3 ntlmssp gensec module
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:33 +11:00
Andrew Bartlett
f88b686167 gensec: move event-using code to gensec_update() hooks out of gensec_start*()
This ensures that only gensec_update() will require an event context argument
when the API is refactored.

Andrew Bartlett
2011-10-18 13:13:33 +11:00
Andrew Bartlett
3f9ab2e8e7 ntlmssp: Refuse to seal if we did not negotiate to sign
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:33 +11:00
Andrew Bartlett
86d684e4d6 gensec: Refuse to seal if we did not negotiate to sign
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:33 +11:00
Andrew Bartlett
09c5acdec8 s4-auth: match the new s3 gensec client and always negotiate SIGN with SEAL
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:32 +11:00
Andrew Bartlett
0d5de7e19c gensec: Assert that we have not been subject to a downgrade attack in DCE/RPC clients
Because of the calling convention, this is the best place to assert
that we have not been subject to a downgrade attack on the negotiated
features.  (In DCE/RPC, this isn't a negotiation, the client simply
specifies the level of protection that is required).

Andrew Bartlett

(some formatting fixes)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:32 +11:00
Andrew Bartlett
5ef4e91cf0 s3-smbd Give the nt error string when failing to set up encrypted transport
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-10-18 13:13:32 +11:00