ira/wip.git
7 years agos3-libsmb: use struct gensec_security directly
Andrew Bartlett [Sat, 14 Jan 2012 01:00:53 +0000 (12:00 +1100)]
s3-libsmb: use struct gensec_security directly

This is rather than via a now one-element union.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-libcli Change krb5 smb sealing to call via gensec and gensec_gse
Andrew Bartlett [Fri, 13 Jan 2012 09:34:10 +0000 (20:34 +1100)]
s3-libcli Change krb5 smb sealing to call via gensec and gensec_gse

This also fixes the support for smb sealing with krb5 in make test, as
this now relies on secrets.tdb rather than /etc/krb5.keytab.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos4:auth/gensec: make sure GSS_C_CONF_FLAG implies GSS_C_INTEG_FLAG
Stefan Metzmacher [Fri, 20 Jan 2012 14:56:17 +0000 (15:56 +0100)]
s4:auth/gensec: make sure GSS_C_CONF_FLAG implies GSS_C_INTEG_FLAG

metze

7 years agos3-gse: make sure GSS_C_CONF_FLAG implies GSS_C_INTEG_FLAG
Stefan Metzmacher [Fri, 20 Jan 2012 14:55:55 +0000 (15:55 +0100)]
s3-gse: make sure GSS_C_CONF_FLAG implies GSS_C_INTEG_FLAG

metze

7 years agos3-gse: implement fill_mem_keytab_from_[system|dedicated]_keytab
Stefan Metzmacher [Fri, 20 Jan 2012 08:31:55 +0000 (09:31 +0100)]
s3-gse: implement fill_mem_keytab_from_[system|dedicated]_keytab

metze

7 years agos3-gse: create memory keytab in gse_krb5_get_server_keytab()
Stefan Metzmacher [Fri, 20 Jan 2012 10:51:59 +0000 (11:51 +0100)]
s3-gse: create memory keytab in gse_krb5_get_server_keytab()

The other functions just add entries to it.

metze

7 years agos3-gse: fix SECRETS_AND_KEYTAB fallback in gse_krb5_get_server_keytab()
Stefan Metzmacher [Fri, 20 Jan 2012 10:50:20 +0000 (11:50 +0100)]
s3-gse: fix SECRETS_AND_KEYTAB fallback in gse_krb5_get_server_keytab()

metze

7 years agos3:kerberos_verify: ads_dedicated_keytab_verify_ticket() only needs read access
Stefan Metzmacher [Fri, 20 Jan 2012 11:20:47 +0000 (12:20 +0100)]
s3:kerberos_verify: ads_dedicated_keytab_verify_ticket() only needs read access

metze

7 years agos3:smbd/proto.h: remove unused do_map_to_guest() prototype
Stefan Metzmacher [Sat, 14 Jan 2012 11:30:21 +0000 (12:30 +0100)]
s3:smbd/proto.h: remove unused do_map_to_guest() prototype

metze

7 years agobuild: Add -lz to wbinfo to fix build on some hosts
Andrew Bartlett [Fri, 6 Jan 2012 09:35:25 +0000 (20:35 +1100)]
build: Add -lz to wbinfo to fix build on some hosts

This is required after the rework of the object lists for gensec_gse

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Jan 20 23:33:14 CET 2012 on sn-devel-104

7 years agos3: Fix the build on FreeBSD8
Volker Lendecke [Fri, 20 Jan 2012 15:46:41 +0000 (16:46 +0100)]
s3: Fix the build on FreeBSD8

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Jan 20 21:58:04 CET 2012 on sn-devel-104

7 years agos3:configure.in: move gss_wrap_iov check to the other function checks
Stefan Metzmacher [Fri, 20 Jan 2012 15:59:10 +0000 (16:59 +0100)]
s3:configure.in: move gss_wrap_iov check to the other function checks

This also makes sure we search for it if it's in -lgssapi
instead of -lgssapi_krb5 or -lgss.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jan 20 20:23:13 CET 2012 on sn-devel-104

7 years agos3:configure.in: require gssapi for ads support
Stefan Metzmacher [Fri, 20 Jan 2012 15:58:14 +0000 (16:58 +0100)]
s3:configure.in: require gssapi for ads support

This matches the waf checks.

metze

7 years agos3:configure.in: move krb5_set_real_time check to other function checks
Stefan Metzmacher [Fri, 20 Jan 2012 15:56:47 +0000 (16:56 +0100)]
s3:configure.in: move krb5_set_real_time check to other function checks

metze

7 years agos3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context
Stefan Metzmacher [Fri, 20 Jan 2012 15:55:43 +0000 (16:55 +0100)]
s3:build: for now do not require gsskrb5_extract_authz_data_from_sec_context

We do not use it yet.

metze

7 years agos3:configure.in: fix the shell logic in krb5 checks
Stefan Metzmacher [Fri, 20 Jan 2012 15:52:03 +0000 (16:52 +0100)]
s3:configure.in: fix the shell logic in krb5 checks

metze

7 years agotorture: add spoolss overlapping driver deletion tests
David Disseldorp [Tue, 17 Jan 2012 16:07:01 +0000 (17:07 +0100)]
torture: add spoolss overlapping driver deletion tests

Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User: David Disseldorp <ddiss@samba.org>
Autobuild-Date: Fri Jan 20 18:20:14 CET 2012 on sn-devel-104

7 years agos3-spoolss: fix printer_driver_files_in_use() call ordering
David Disseldorp [Tue, 17 Jan 2012 16:06:38 +0000 (17:06 +0100)]
s3-spoolss: fix printer_driver_files_in_use() call ordering

printer_driver_files_in_use() performs two tasks: it returns whether any
of the files in the to-be-deleted driver overlap with other drivers, it
also trims such files from the info structure passed in.

In processing a DeletePrinterDataEx request with DPD_DELETE_UNUSED_FILES
set, printer_driver_files_in_use() must be called to ensure files in
use by other drivers are not removed.

https://bugzilla.samba.org/show_bug.cgi?id=4942

Signed-off-by: Andreas Schneider <asn@samba.org>
7 years agotorture: confirm printer driver file removal
David Disseldorp [Tue, 17 Jan 2012 14:20:51 +0000 (15:20 +0100)]
torture: confirm printer driver file removal

Signed-off-by: Andreas Schneider <asn@samba.org>
7 years agotorture: add spoolss del printer driver test
David Disseldorp [Mon, 16 Jan 2012 15:30:17 +0000 (16:30 +0100)]
torture: add spoolss del printer driver test

Test handling of DeletePrinterDriverEx when the DPD_DELETE_ALL_FILES
flag is set.

Signed-off-by: Andreas Schneider <asn@samba.org>
7 years agos3-spoolss: fix printer driver version deletion
David Disseldorp [Thu, 12 Jan 2012 15:27:37 +0000 (16:27 +0100)]
s3-spoolss: fix printer driver version deletion

Spoolss delete printer driver code currently makes invalid version
assumptions based on the architecture requested by the client.

Ugly hacks are in place to cover removal of other versions (2 and 3).
This change wraps multi version deletion in a simple for loop.

Signed-off-by: Andreas Schneider <asn@samba.org>
7 years agos3-spoolss: prefix print$ path on driver file deletion
David Disseldorp [Wed, 11 Jan 2012 18:50:36 +0000 (19:50 +0100)]
s3-spoolss: prefix print$ path on driver file deletion

Driver file paths stored in the registry do not include the server path
prefix. delete_driver_files() incorrectly assumes such a prefix.

https://bugzilla.samba.org/show_bug.cgi?id=8697

Signed-off-by: Andreas Schneider <asn@samba.org>
7 years agos3: Fix a typo
Volker Lendecke [Thu, 19 Jan 2012 11:10:38 +0000 (12:10 +0100)]
s3: Fix a typo

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Jan 19 13:43:07 CET 2012 on sn-devel-104

7 years agoNow make_connection_snum() is a static function that takes a
Jeremy Allison [Thu, 19 Jan 2012 04:52:47 +0000 (20:52 -0800)]
Now make_connection_snum() is a static function that takes a
connection_struct as a parameter, fix the interface to allow
it to return an NTSTATUS.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Jan 19 07:25:49 CET 2012 on sn-devel-104

7 years agodynconfig/wscript: correctly cleanup PRIVATELIBDIR and MODULESDIR defaults
Stefan Metzmacher [Wed, 18 Jan 2012 21:54:28 +0000 (22:54 +0100)]
dynconfig/wscript: correctly cleanup PRIVATELIBDIR and MODULESDIR defaults

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Jan 19 00:47:50 CET 2012 on sn-devel-104

7 years agoFix bug 8710 - connections.tdb - major leak with SMB2.
Jeremy Allison [Wed, 18 Jan 2012 20:38:14 +0000 (12:38 -0800)]
Fix bug 8710 - connections.tdb - major leak with SMB2.

Ensure the cnum used to claim the connection for SMB2 is the
id that will be used for the SMB2 tcon. Based on code from
Ira Cooper <ira@wakeful.net>.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jan 18 23:14:32 CET 2012 on sn-devel-104

7 years agos3-aio-pthread: num threads should be int
Volker Lendecke [Wed, 18 Jan 2012 17:12:57 +0000 (18:12 +0100)]
s3-aio-pthread: num threads should be int

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jan 18 21:04:20 CET 2012 on sn-devel-104

7 years agoauth/gensec: align common elements between gse_context and gensec_gssapi_state
Andrew Bartlett [Wed, 11 Jan 2012 00:52:13 +0000 (11:52 +1100)]
auth/gensec: align common elements between gse_context and gensec_gssapi_state

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Jan 18 19:29:40 CET 2012 on sn-devel-104

7 years agos3-gse: align common elements between gse_context and gensec_gssapi_state
Andrew Bartlett [Wed, 11 Jan 2012 00:52:13 +0000 (11:52 +1100)]
s3-gse: align common elements between gse_context and gensec_gssapi_state

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gensec: Add hook to allow gensec to know if kerberos is permitted
Andrew Bartlett [Thu, 12 Jan 2012 10:16:36 +0000 (21:16 +1100)]
s3-gensec: Add hook to allow gensec to know if kerberos is permitted

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse: Make gensec_gse cope with non-DCE GSSAPI
Andrew Bartlett [Sat, 14 Jan 2012 00:40:18 +0000 (11:40 +1100)]
s3-gse: Make gensec_gse cope with non-DCE GSSAPI

The validation of the mutual authentication reply produces no further
data to send to the server.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse: the server should not check for GSS_C_MUTUAL_FLAG
Stefan Metzmacher [Sat, 14 Jan 2012 10:28:28 +0000 (11:28 +0100)]
s3-gse: the server should not check for GSS_C_MUTUAL_FLAG

It up to the client to ask for GSS_C_MUTUAL_FLAG,
except for the dcerpc case, where the server is stricter.

metze

7 years agos3-gse: verify that we got GSS_C_DCE_STYLE when expected
Stefan Metzmacher [Sat, 14 Jan 2012 10:27:21 +0000 (11:27 +0100)]
s3-gse: verify that we got GSS_C_DCE_STYLE when expected

GSS_C_DCE_STYLE implies GSS_C_MUTUAL_FLAG, so also check for it.

metze

7 years agos3-gse Remove authenticated flag from gse
Andrew Bartlett [Wed, 11 Jan 2012 00:39:17 +0000 (11:39 +1100)]
s3-gse Remove authenticated flag from gse

The only user for this flag is called only directly after it was set.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse remove special more_processing hook from gse
Andrew Bartlett [Wed, 11 Jan 2012 00:36:58 +0000 (11:36 +1100)]
s3-gse remove special more_processing hook from gse

The NT_STATUS_MORE_PROCESSING_REQUIRED status code is what gensec
is expecting in any case.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Rename gss_c_flags and ret_flags in gse
Andrew Bartlett [Wed, 11 Jan 2012 00:29:01 +0000 (11:29 +1100)]
s3-gse Rename gss_c_flags and ret_flags in gse

This make it clearer what type of flags these are and matches
gensec_gssapi

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Rename gss_ctx to match gensec_gssapi_context
Andrew Bartlett [Wed, 11 Jan 2012 00:18:16 +0000 (11:18 +1100)]
s3-gse Rename gss_ctx to match gensec_gssapi_context

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Rename delegated_creds to match gensec_gssapi_context
Andrew Bartlett [Wed, 11 Jan 2012 00:17:26 +0000 (11:17 +1100)]
s3-gse Rename delegated_creds to match gensec_gssapi_context

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc: pass struct ndr_interface_table down to cli_pipe_open_generic/spnego()
Andrew Bartlett [Tue, 10 Jan 2012 10:53:42 +0000 (21:53 +1100)]
s3-librpc: pass struct ndr_interface_table down to cli_pipe_open_generic/spnego()

This allows the target service (as determined from the IDL) to be
passed to GSSAPI (rather than the current, incorrect, "cifs").

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-utils/net: pass struct ndr_interface_table down
Andrew Bartlett [Tue, 10 Jan 2012 10:53:42 +0000 (21:53 +1100)]
s3-utils/net: pass struct ndr_interface_table down

This will allow the target service (as determined from the IDL) to be
passed to GSSAPI (rather than the current, incorrect, "cifs").

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-rpcclient: pass struct ndr_interface_table down
Andrew Bartlett [Tue, 10 Jan 2012 10:53:42 +0000 (21:53 +1100)]
s3-rpcclient: pass struct ndr_interface_table down

This will allow the target service (as determined from the IDL) to be
passed to GSSAPI (rather than the current, incorrect, "cifs").

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Make cli_rpc_pipe_open_spnego_ntlmssp() generic
Andrew Bartlett [Tue, 10 Jan 2012 10:03:02 +0000 (21:03 +1100)]
s3-librpc Make cli_rpc_pipe_open_spnego_ntlmssp() generic

This also avoids passing NULL as the server to
gensec_set_target_hostname() in spnego_generic_init_client().

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse gss_wrap_iov_length() only needs the type and length
Stefan Metzmacher [Fri, 6 Jan 2012 15:58:51 +0000 (16:58 +0100)]
s3-gse gss_wrap_iov_length() only needs the type and length

metze

7 years agos3-gse Make seal parameter a boolean for clarity
Andrew Bartlett [Tue, 3 Jan 2012 13:42:35 +0000 (00:42 +1100)]
s3-gse Make seal parameter a boolean for clarity

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Remove special case for spnego session key
Andrew Bartlett [Tue, 3 Jan 2012 11:00:11 +0000 (22:00 +1100)]
s3-librpc Remove special case for spnego session key

SPNEGO is implemented only in terms of gensec mechanisms now.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Remove special case for spnego dcerpc sign/seal
Andrew Bartlett [Tue, 3 Jan 2012 10:54:49 +0000 (21:54 +1100)]
s3-librpc Remove special case for spnego dcerpc sign/seal

SPNEGO is implemented only in terms of gensec mechanisms now.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Move GSS_C_DCE_STYLE backup definition to gse.c
Andrew Bartlett [Mon, 2 Jan 2012 10:04:57 +0000 (21:04 +1100)]
s3-gse Move GSS_C_DCE_STYLE backup definition to gse.c

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Add const
Andrew Bartlett [Mon, 2 Jan 2012 09:38:31 +0000 (20:38 +1100)]
s3-gse Add const

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Remove or make static unused/local-only GSE functions
Andrew Bartlett [Mon, 2 Jan 2012 09:30:41 +0000 (20:30 +1100)]
s3-gse Remove or make static unused/local-only GSE functions

The GSE layer is now used via the GENSEC module, so we do not need these
functions exposed any more.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Remove unused dcesrv_gssapi.[ch] functions
Andrew Bartlett [Mon, 2 Jan 2012 09:30:41 +0000 (20:30 +1100)]
s3-librpc Remove unused dcesrv_gssapi.[ch] functions

The code from dcesrv_gssapi.c is now
in source3/auth/auth_generic.c as an auth callback.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Remove layer around struct gensec_security
Andrew Bartlett [Mon, 2 Jan 2012 04:50:07 +0000 (15:50 +1100)]
s3-librpc Remove layer around struct gensec_security

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc: Simplify SPNEGO code now that all mechs use a struct gensec_security
Andrew Bartlett [Mon, 2 Jan 2012 04:48:09 +0000 (15:48 +1100)]
s3-librpc: Simplify SPNEGO code now that all mechs use a struct gensec_security

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Call SPENGO/GSSAPI via the auth_generic layer and gensec
Andrew Bartlett [Mon, 2 Jan 2012 04:38:38 +0000 (15:38 +1100)]
s3-librpc Call SPENGO/GSSAPI via the auth_generic layer and gensec

This simplifies a lot of code, as we know we are always dealing
with a struct gensec_security, and allows the gensec module being
used to implement GSSAPI to be swapped for AD-server operation.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Allow spnego_generic_init_client to handle kerberos too
Andrew Bartlett [Mon, 2 Jan 2012 04:26:15 +0000 (15:26 +1100)]
s3-librpc Allow spnego_generic_init_client to handle kerberos too

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-librpc Call GSSAPI via the auth_generic layer and gensec
Andrew Bartlett [Mon, 2 Jan 2012 02:06:29 +0000 (13:06 +1100)]
s3-librpc Call GSSAPI via the auth_generic layer and gensec

This simplifies a lot of code, as we know we are always dealing with a
struct gensec_security, and allows the gensec module being used to
implement GSSAPI to be swapped when required for AD-server operation.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-libsmb Use the gse_krb5 gensec module as client
Andrew Bartlett [Mon, 2 Jan 2012 09:22:38 +0000 (20:22 +1100)]
s3-libsmb Use the gse_krb5 gensec module as client

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse Make gse available as a gensec client module
Andrew Bartlett [Mon, 2 Jan 2012 09:22:38 +0000 (20:22 +1100)]
s3-gse Make gse available as a gensec client module

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-build: Rework object lists to allow gse gensec module
Andrew Bartlett [Mon, 2 Jan 2012 23:52:06 +0000 (00:52 +0100)]
s3-build: Rework object lists to allow gse gensec module

This also allows the spnego_parse_krb5_wrap() function to be shared.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-gse: Add gensec wrapper for gse GSSAPI client
Andrew Bartlett [Tue, 27 Dec 2011 22:55:55 +0000 (09:55 +1100)]
s3-gse: Add gensec wrapper for gse GSSAPI client

This brings in part of the s4 gensec_gssapi as the boilerplate for the
new module.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-auth Match session setup handling of krb5, store the PAC
Andrew Bartlett [Tue, 10 Jan 2012 11:01:44 +0000 (22:01 +1100)]
s3-auth Match session setup handling of krb5, store the PAC

This will allow non-krb5 services to get the full user groups
without need to do an online s4u2self.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3-auth Add auth hook for PAC parsing
Andrew Bartlett [Sat, 31 Dec 2011 11:57:18 +0000 (22:57 +1100)]
s3-auth Add auth hook for PAC parsing

This will allow gensec_gse to parse the PAC.

This is a copy from source3/rpc_server/dcesrv_generic.c to preserve
behaviour.  A future commit will enable the samlogon cache.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
7 years agos3: Use lock_order for setting the db priority
Volker Lendecke [Mon, 16 Jan 2012 12:42:52 +0000 (13:42 +0100)]
s3: Use lock_order for setting the db priority

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jan 18 16:21:52 CET 2012 on sn-devel-104

7 years agos3: Pass down lock_order to db_open_ctdb
Volker Lendecke [Mon, 16 Jan 2012 11:50:44 +0000 (12:50 +0100)]
s3: Pass down lock_order to db_open_ctdb

7 years agoRevert "Fix bug #8175 - smbd deadlock."
Volker Lendecke [Fri, 13 Jan 2012 13:10:44 +0000 (14:10 +0100)]
Revert "Fix bug #8175 - smbd deadlock."

This reverts commit 5a2b5b6cfed74e0e9c2965525995f64cdad7b7c9.

7 years agos3: Change locking order between brlock and locking
Volker Lendecke [Fri, 13 Jan 2012 12:26:41 +0000 (13:26 +0100)]
s3: Change locking order between brlock and locking

But 8175 was fixed in a way that brlock.tdb was always locked before
locking.tdb. This patch fixes the bug in a different way. locking.tdb
is the central tdb for files and should always be locked first.
This patch solves the problem by postponing the level2 break messages,
which are async anyway.

7 years agos3: Enforce a lock order in dbwrap
Volker Lendecke [Sun, 8 Jan 2012 18:04:39 +0000 (19:04 +0100)]
s3: Enforce a lock order in dbwrap

This makes sure we do not deadlock from doing two dbwrap_fetch_locked in two
processes in different orders. At open time, we assign a strict order to all
databases. lock_order 1 will be locked first, lock_order 2 second. No two
records of the same lock order may be locked at the same time.

7 years agos3: Add a "lock_order" argument to db_open
Volker Lendecke [Fri, 6 Jan 2012 16:19:54 +0000 (17:19 +0100)]
s3: Add a "lock_order" argument to db_open

This will be used to enforce a lock hierarchy between the databases. We have
seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb.
These should be fixed by refusing a dbwrap_fetch_locked that does not follow a
defined lock hierarchy.

7 years agos3-passdb: trying to decouple passdb and secrets a little.
Günther Deschner [Mon, 17 Oct 2011 20:00:45 +0000 (22:00 +0200)]
s3-passdb: trying to decouple passdb and secrets a little.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Jan 18 14:46:18 CET 2012 on sn-devel-104

7 years agos3: Fix bug 8695
Volker Lendecke [Tue, 17 Jan 2012 16:14:38 +0000 (17:14 +0100)]
s3: Fix bug 8695

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Jan 17 18:55:01 CET 2012 on sn-devel-104

7 years agoRHEL-CTDB: *.msg files moved
Volker Lendecke [Tue, 17 Jan 2012 13:21:30 +0000 (14:21 +0100)]
RHEL-CTDB: *.msg files moved

7 years agoRHEL-CTDB: *.dat files moved
Volker Lendecke [Tue, 17 Jan 2012 13:21:30 +0000 (14:21 +0100)]
RHEL-CTDB: *.dat files moved

7 years agoRHEL-CTDB: CP*so are no more
Volker Lendecke [Tue, 17 Jan 2012 13:21:30 +0000 (14:21 +0100)]
RHEL-CTDB: CP*so are no more

7 years agoRHEL-CTDB: --with-mandir -> --mandir
Volker Lendecke [Tue, 17 Jan 2012 13:21:30 +0000 (14:21 +0100)]
RHEL-CTDB: --with-mandir -> --mandir

7 years agodynconfig: overwrite --with-privatelibdir as a Samba option
Stefan Metzmacher [Tue, 17 Jan 2012 11:51:57 +0000 (12:51 +0100)]
dynconfig: overwrite --with-privatelibdir as a Samba option

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jan 17 17:17:56 CET 2012 on sn-devel-104

7 years agodynconfig: --with-modulesdir should be a Samba option
Stefan Metzmacher [Tue, 17 Jan 2012 11:32:47 +0000 (12:32 +0100)]
dynconfig: --with-modulesdir should be a Samba option

This also restores the defaults from Samba 3.6.x:
"${libdir}" or "${libdir}/samba" in FHS mode.

metze

7 years agodynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and dataro...
Stefan Metzmacher [Tue, 17 Jan 2012 11:29:53 +0000 (12:29 +0100)]
dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir and datarootdir in Makefile

Otherwise $prefix is "NONE" without explicit --prefix

metze

7 years agos3:lib/messages: remove unused messaging_event_context()
Stefan Metzmacher [Mon, 16 Jan 2012 15:15:59 +0000 (16:15 +0100)]
s3:lib/messages: remove unused messaging_event_context()

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jan 17 09:45:30 CET 2012 on sn-devel-104

7 years agos3:smbcontrol: avoid using messaging_event_context()
Stefan Metzmacher [Mon, 16 Jan 2012 15:14:35 +0000 (16:14 +0100)]
s3:smbcontrol: avoid using messaging_event_context()

metze

7 years agos3:smbcontrol: pass tevent_context down to wait_replies()
Stefan Metzmacher [Mon, 16 Jan 2012 15:11:42 +0000 (16:11 +0100)]
s3:smbcontrol: pass tevent_context down to wait_replies()

metze

7 years agos3:smbcontrol: pass tevent_context down to subcommands
Stefan Metzmacher [Mon, 16 Jan 2012 15:08:48 +0000 (16:08 +0100)]
s3:smbcontrol: pass tevent_context down to subcommands

metze

7 years agos3:printing: avoid messaging_event_context() in print_queue_housekeeping()
Stefan Metzmacher [Mon, 16 Jan 2012 14:54:41 +0000 (15:54 +0100)]
s3:printing: avoid messaging_event_context() in print_queue_housekeeping()

metze

7 years agos3-install: Don't let MANDIR and SRCDIR be overwritten
Volker Lendecke [Mon, 16 Jan 2012 15:43:10 +0000 (16:43 +0100)]
s3-install: Don't let MANDIR and SRCDIR be overwritten

In installman.sh, we get them via cmd line args

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Jan 16 18:55:40 CET 2012 on sn-devel-104

7 years agos4:dsdb/password_hash: require a "Primary:Kerberos" blob in supplementalCredentials
Stefan Metzmacher [Mon, 16 Jan 2012 14:32:21 +0000 (15:32 +0100)]
s4:dsdb/password_hash: require a "Primary:Kerberos" blob in supplementalCredentials

If this is missing a w2k8r2 server will reboot, when someone tries to
change a password.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jan 16 17:10:07 CET 2012 on sn-devel-104

7 years agos3:selftest: rpcclient doesn't support smb2
Stefan Metzmacher [Sat, 14 Jan 2012 10:17:33 +0000 (11:17 +0100)]
s3:selftest: rpcclient doesn't support smb2

metze

7 years agos3: ADS support is needed for dns updates
Volker Lendecke [Sat, 14 Jan 2012 12:47:08 +0000 (13:47 +0100)]
s3: ADS support is needed for dns updates

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat Jan 14 15:32:15 CET 2012 on sn-devel-104

7 years agoKCC importldif/exportldif and intersite topology
Dave Craft [Wed, 11 Jan 2012 14:11:35 +0000 (08:11 -0600)]
KCC importldif/exportldif and intersite topology

Add options for extracting an LDIF file from a database
and reimporting the LDIF into a schema-less database for
subsequent topology test/debug.  Add intersite topology
generation with computation of ISTG and bridgehead servers

Signed-off-by: Andrew Tridgell <tridge@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Sat Jan 14 07:45:11 CET 2012 on sn-devel-104

7 years agoIntersite KCC flags for python
Dave Craft [Wed, 11 Jan 2012 14:10:27 +0000 (08:10 -0600)]
Intersite KCC flags for python

Add NTDSSITELINK options to dsdb class for use
in python samba_kcc

Signed-off-by: Andrew Tridgell <tridge@samba.org>
7 years agoIntersite KCC flags
Dave Craft [Wed, 11 Jan 2012 14:08:52 +0000 (08:08 -0600)]
Intersite KCC flags

NTDSSITELINK option flags added

Signed-off-by: Andrew Tridgell <tridge@samba.org>
7 years agoidl: add to_null property
David Disseldorp [Fri, 13 Jan 2012 21:51:22 +0000 (13:51 -0800)]
idl: add to_null property

to_null specifies that character conversion should only occur until the
null pointer in an array based string.

Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Jan 14 00:51:54 CET 2012 on sn-devel-104

7 years agoidl: add to_null attribute to the spoolss devicename array
David Disseldorp [Wed, 23 Nov 2011 01:03:48 +0000 (02:03 +0100)]
idl: add to_null attribute to the spoolss devicename array

OpenPrinterEx requests have also been observed in the wild carrying
non-utf16 garbage after the device mode devicename field null
terminator.

Signed-off-by: Jeremy Allison <jra@samba.org>
7 years agoidl: add to_null attribute to the spoolss formname array
David Disseldorp [Sun, 13 Nov 2011 19:40:56 +0000 (20:40 +0100)]
idl: add to_null attribute to the spoolss formname array

OpenPrinterEx requests have been observed in the wild carrying a device
mode formname "A4" followed by non-utf16 garbage after the null
terminator. Such requests currently fail during unmarshalling in the
ndr_pull_charset() codepath, causing intermittent print job failures.

This change ensures that garbage after the device mode formname null
terminator is not processed in unmarshalling.

https://bugzilla.samba.org/show_bug.cgi?id=8606

Signed-off-by: Jeremy Allison <jra@samba.org>
7 years agondr: add ndr_pull_charset_to_null()
David Disseldorp [Sun, 13 Nov 2011 19:01:43 +0000 (20:01 +0100)]
ndr: add ndr_pull_charset_to_null()

The same as ndr_pull_charset(), however only perform character
conversion on bytes prior to and including the null terminator.

Signed-off-by: Jeremy Allison <jra@samba.org>
7 years agoidl: add parser for the to_null property
David Disseldorp [Sun, 13 Nov 2011 19:39:58 +0000 (20:39 +0100)]
idl: add parser for the to_null property

Compile into a ndr_pull_charset_to_null call.

Signed-off-by: Jeremy Allison <jra@samba.org>
7 years agos4-smbtorture: tweak spoolss_OpenPrinterEx devmode
David Disseldorp [Tue, 15 Nov 2011 17:08:43 +0000 (18:08 +0100)]
s4-smbtorture: tweak spoolss_OpenPrinterEx devmode

Flip some bits after the null terminator in the spoolss device mode
character arrays to trigger bug 8606.

Signed-off-by: Jeremy Allison <jra@samba.org>
7 years agos3: Fix the talloc hierarchy in fetch_share_mode_unlocked
Volker Lendecke [Wed, 11 Jan 2012 18:51:53 +0000 (19:51 +0100)]
s3: Fix the talloc hierarchy in fetch_share_mode_unlocked

Thanks, metze for noticing!

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Jan 13 13:16:44 CET 2012 on sn-devel-104

7 years agos3-waf: check for KRB5_PDU_NONE as in the autoconf build.
Günther Deschner [Thu, 12 Jan 2012 15:29:39 +0000 (16:29 +0100)]
s3-waf: check for KRB5_PDU_NONE as in the autoconf build.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jan 13 11:15:35 CET 2012 on sn-devel-104

7 years agos3-autoconf: fix the build of the pdb_ldap shared module in autoconf build as well.
Günther Deschner [Thu, 12 Jan 2012 14:08:34 +0000 (15:08 +0100)]
s3-autoconf: fix the build of the pdb_ldap shared module in autoconf build as well.

Guenther

7 years agos3-waf: fix compile of pdb_ldap as shared module by moving ldap schema helpers to...
Günther Deschner [Thu, 12 Jan 2012 14:06:25 +0000 (15:06 +0100)]
s3-waf: fix compile of pdb_ldap as shared module by moving ldap schema helpers to libpdb.so

These helpers are used in other parts of Samba as well (like in idmap and in the
net provision code).

Guenther

7 years agos3-waf: also check for gsskrb5_extract_authz_data_from_sec_context() during
Günther Deschner [Thu, 12 Jan 2012 13:27:10 +0000 (14:27 +0100)]
s3-waf: also check for gsskrb5_extract_authz_data_from_sec_context() during
configure.

Guenther

7 years agos3:build: add auth/gensec/spnego.o
Stefan Metzmacher [Thu, 12 Jan 2012 14:42:08 +0000 (15:42 +0100)]
s3:build: add auth/gensec/spnego.o

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jan 13 06:32:30 CET 2012 on sn-devel-104