7 years agofile_server: Clarify code by avoiding a goto
Andrew Bartlett [Tue, 4 Sep 2012 07:18:45 +0000 (17:18 +1000)]
file_server: Clarify code by avoiding a goto

As suggested by Ricky Nance <>

Andrew Bartlett

7 years agos4-samba-tool: Ensure we also sync the SACL as well as the DACL during sysvolreset
Andrew Bartlett [Tue, 4 Sep 2012 07:17:34 +0000 (17:17 +1000)]
s4-samba-tool: Ensure we also sync the SACL as well as the DACL during sysvolreset

7 years agos3-passdb: Rename pdb_samba4 to samba_dsdb and autoconfigure when we are a AD DC
Andrew Bartlett [Tue, 4 Sep 2012 00:27:50 +0000 (10:27 +1000)]
s3-passdb: Rename pdb_samba4 to samba_dsdb and autoconfigure when we are a AD DC

The name samba_dsdb is not ideal, but it matches the primary ldb
module we use, and more importantly it avoids having '4' in the name.
We should slowly avoid using the term samba4 in long-term places like
the smb.conf because it is confusing to users given we are shipping
Samba 4.0 as an AD DC as well as all the other supported roles (domain
member/standalone server/classic DC)

Additionally, samba4 will be an odd name when we eventually release
Samba 5.0!

samba4 remains accepted as an alias to ensure existing smb.conf files
load, but to allow changes here in the future, we set the value during
the smb.conf load, and not during the provision when we are an AD DC.

This simplifies the default smb.conf for the vast majority of our
users and reduces the number of things listed in smb.conf files that
we later have to work around if we wish to change the
name/implementation of the passdb glue module again.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Tue Sep  4 04:45:16 CEST 2012 on sn-devel-104

7 years agodocs: Move Samba4 HOWTO link into README
Andrew Bartlett [Mon, 3 Sep 2012 23:31:27 +0000 (09:31 +1000)]
docs: Move Samba4 HOWTO link into README

This allows us to make clear that it applies to the AD DC deployment.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Tue Sep  4 03:05:02 CEST 2012 on sn-devel-104

7 years agodocs: Update Roadmap
Andrew Bartlett [Mon, 3 Sep 2012 23:24:52 +0000 (09:24 +1000)]
docs: Update Roadmap

7 years agodocs: Remove merged-branches.txt
Andrew Bartlett [Mon, 3 Sep 2012 23:20:19 +0000 (09:20 +1000)]
docs: Remove merged-branches.txt

We are now well past simply having two projects in once tree, and each
continued reference to 'samba3' and 'samba4' causes user confusion.

Andrew Bartlett

7 years agodocs: Remove docs for removed parameter 'display charset'
Andrew Bartlett [Mon, 3 Sep 2012 23:12:17 +0000 (09:12 +1000)]
docs: Remove docs for removed parameter 'display charset'

7 years agoremove extra tab from Makefile
Andrew Bartlett [Mon, 3 Sep 2012 23:10:59 +0000 (09:10 +1000)]
remove extra tab from Makefile

7 years agodocs: Fix undocumented target to find smb.conf directives in the right place
Andrew Bartlett [Mon, 3 Sep 2012 23:09:38 +0000 (09:09 +1000)]
docs: Fix undocumented target to find smb.conf directives in the right place

The manpages target needs to be reworked to know about waf.

Andrew Bartlett

7 years agodocs: Remove references to security=share and security=server from the smb.conf docs
Andrew Bartlett [Mon, 3 Sep 2012 22:46:06 +0000 (08:46 +1000)]
docs: Remove references to security=share and security=server from the smb.conf docs

7 years agodocs: Remove docs for removed parameter 'parinoid server security'
Andrew Bartlett [Mon, 3 Sep 2012 22:27:23 +0000 (08:27 +1000)]
docs: Remove docs for removed parameter 'parinoid server security'

7 years agodocs: Rename manpages-3 -> manpages.
Karolin Seeger [Mon, 3 Sep 2012 19:49:25 +0000 (21:49 +0200)]
docs: Rename manpages-3 -> manpages.

This change was suggested by Andrew Bartlett on the samba-technical mailing


Autobuild-User(master): Karolin Seeger <>
Autobuild-Date(master): Mon Sep  3 23:35:38 CEST 2012 on sn-devel-104

7 years agos4-docs: Remove empty s4 HOWTO Collection.
Karolin Seeger [Mon, 3 Sep 2012 19:05:22 +0000 (21:05 +0200)]
s4-docs: Remove empty s4 HOWTO Collection.

This change was proposed by Andrew Bartlett on the samba-technical mailing list.


7 years agobuild: skip shipping the alpha13 provision in the release tarballs
Andrew Bartlett [Mon, 3 Sep 2012 08:55:06 +0000 (18:55 +1000)]
build: skip shipping the alpha13 provision in the release tarballs

This test is important, but it is not important enough to include this volume of data
in every tarball.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Mon Sep  3 13:01:58 CEST 2012 on sn-devel-104

7 years agos4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID
Andrew Bartlett [Mon, 3 Sep 2012 08:50:16 +0000 (18:50 +1000)]
s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID

7 years agobuild: Only make bin/ if it does not exist
Andrew Bartlett [Mon, 3 Sep 2012 08:43:33 +0000 (18:43 +1000)]
build: Only make bin/ if it does not exist

7 years agoselftest: skip tests if the tarball did not include the alpha13 provision
Andrew Bartlett [Mon, 3 Sep 2012 08:42:55 +0000 (18:42 +1000)]
selftest: skip tests if the tarball did not include the alpha13 provision

7 years agowaf: add new quota header checks and sysquota_4B source file
Björn Jacke [Sun, 2 Sep 2012 19:45:53 +0000 (21:45 +0200)]
waf: add new quota header checks and sysquota_4B source file

Autobuild-User(master): Björn Jacke <>
Autobuild-Date(master): Sun Sep  2 23:21:22 CEST 2012 on sn-devel-104

7 years agos3: remove some duplicate quota code
Björn Jacke [Sun, 2 Sep 2012 19:44:54 +0000 (21:44 +0200)]
s3: remove some duplicate quota code

7 years agos3: adopt the new sysquotas_4B support for BSD
Björn Jacke [Sun, 2 Sep 2012 14:08:58 +0000 (16:08 +0200)]
s3: adopt the new sysquotas_4B support for BSD

most BSD systems have ufs/ufs/quota.h and they count the quota in blocks, not
bytes and have slightly different dqblk struct members.

7 years agos3: add sysquotas_4B support
Björn Jacke [Sun, 1 Jul 2012 12:35:55 +0000 (14:35 +0200)]
s3: add sysquotas_4B support

this is from James Peach's darwin patch, that exists since a couple of years

Autobuild-User(master): Björn Jacke <>
Autobuild-Date(master): Sun Sep  2 01:00:41 CEST 2012 on sn-devel-104

7 years agos3: Make an if statement a bit easier to read
Volker Lendecke [Fri, 31 Aug 2012 12:11:45 +0000 (14:11 +0200)]
s3: Make an if statement a bit easier to read

Fix indentation a bit

Signed-off-by: Jeremy Allison <>
Autobuild-User(master): Jeremy Allison <>
Autobuild-Date(master): Sat Sep  1 07:07:12 CEST 2012 on sn-devel-104

7 years agoNow SEC_RIGHTS_PRIV_RESTORE and SEC_RIGHTS_PRIV_BACKUP don't include any generic...
Jeremy Allison [Fri, 31 Aug 2012 21:42:21 +0000 (14:42 -0700)]
Now SEC_RIGHTS_PRIV_RESTORE and SEC_RIGHTS_PRIV_BACKUP don't include any generic bits (they're used directly in the fileserver where the generic bits have already been mapped into file specific bits) we need to add the generic bits to the test when we have these privileges.

Mark samba4.base.maximum_allowed knownfail until we implement NTCREATEX_OPTIONS_BACKUP_INTENT.

7 years agoRewrite torture_samba3_rpc_sharesec() to use a non-privileged user for share security...
Jeremy Allison [Fri, 31 Aug 2012 19:42:16 +0000 (12:42 -0700)]
Rewrite torture_samba3_rpc_sharesec() to use a non-privileged user for share security descriptor testing.

7 years agoAdd a comment showing where to set log level in tests.
Jeremy Allison [Fri, 31 Aug 2012 19:41:48 +0000 (12:41 -0700)]
Add a comment showing where to set log level in tests.

7 years agoChange the S3 fileserver over to se_file_access_check().
Jeremy Allison [Mon, 27 Aug 2012 23:07:32 +0000 (16:07 -0700)]
Change the S3 fileserver over to se_file_access_check().

Don't set the priv_open_requested yet until the open-for-backup
request is correctly passed in.

7 years agoFactor out privilege checking code into se_file_access_check() which takes a bool...
Jeremy Allison [Mon, 27 Aug 2012 22:41:18 +0000 (15:41 -0700)]
Factor out privilege checking code into se_file_access_check() which takes a bool priv_open_requested parameter.

7 years agoSEC_RIGHTS_DIR_PRIV_BACKUP and SEC_RIGHTS_DIR_PRIV_RESTORE aren't used anywhere....
Jeremy Allison [Mon, 27 Aug 2012 21:15:35 +0000 (14:15 -0700)]
SEC_RIGHTS_DIR_PRIV_BACKUP and SEC_RIGHTS_DIR_PRIV_RESTORE aren't used anywhere. Remove (can re-add if needed).

Ensure the privilege rights are always specific rights, not generic.
By the time the privilege rights are examined, we've already mapped
from generic to specific in the access_mask.

7 years agos4-dsdb: Remove unused variables
Andrew Bartlett [Sat, 1 Sep 2012 01:36:36 +0000 (11:36 +1000)]
s4-dsdb: Remove unused variables

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Sat Sep  1 05:10:47 CEST 2012 on sn-devel-104

7 years agos4-kdc: Improve grammer and clarity of password change failure messages.
Andrew Bartlett [Sat, 1 Sep 2012 01:34:33 +0000 (11:34 +1000)]
s4-kdc: Improve grammer and clarity of password change failure messages.

This can still be improved further, but avoid mentioning reasons that
clearly do not apply in this case.

Andrew Bartlett

7 years agos3: Fix warnings in aio_fork.c
Volker Lendecke [Fri, 31 Aug 2012 12:45:08 +0000 (14:45 +0200)]
s3: Fix warnings in aio_fork.c

7 years agos3: Remove a shadowing variable declaration
Volker Lendecke [Fri, 31 Aug 2012 12:17:49 +0000 (14:17 +0200)]
s3: Remove a shadowing variable declaration

7 years agos4-dsdb: Remove unused tmp_ctx leaked onto long-term ldb_context
Andrew Bartlett [Sat, 1 Sep 2012 01:29:46 +0000 (11:29 +1000)]
s4-dsdb: Remove unused tmp_ctx leaked onto long-term ldb_context

This was found based on a log provided by Ricky Nance
<>.  Thanks Ricky!

Andrew Bartlett

7 years agos4 dns: Store TKEYs in a ringbuffer
Kai Blin [Fri, 31 Aug 2012 11:41:19 +0000 (13:41 +0200)]
s4 dns: Store TKEYs in a ringbuffer

This stops us from potentially being DoSed by tons of TKEYs

Autobuild-User(master): Kai Blin <>
Autobuild-Date(master): Fri Aug 31 22:46:01 CEST 2012 on sn-devel-104

7 years agotdb: return unpack error on strdup failure
David Disseldorp [Fri, 31 Aug 2012 15:41:31 +0000 (17:41 +0200)]
tdb: return unpack error on strdup failure

Signed-off-by: Lars Müller <>
Autobuild-User(master): David Disseldorp <>
Autobuild-Date(master): Fri Aug 31 21:05:21 CEST 2012 on sn-devel-104

7 years agos3: Fix a few "warning: ISO C90 forbids mixed declarations and code"
Volker Lendecke [Fri, 31 Aug 2012 12:10:02 +0000 (14:10 +0200)]
s3: Fix a few "warning: ISO C90 forbids mixed declarations and code"

Autobuild-User(master): Björn Jacke <>
Autobuild-Date(master): Fri Aug 31 19:24:47 CEST 2012 on sn-devel-104

7 years agos3:build fix autoconf build on RHEL5
Christian Ambach [Fri, 31 Aug 2012 09:00:23 +0000 (11:00 +0200)]
s3:build fix autoconf build on RHEL5

RHEL5 only has autoconf 2.59, so still needs to find autoconf-2.60.m4
somewhere, but it was removed with 5f58359

Autobuild-User(master): Christian Ambach <>
Autobuild-Date(master): Fri Aug 31 12:50:03 CEST 2012 on sn-devel-104

7 years agos3:doc Fix name of timeout parameter in documentation
Christof Schmitt [Thu, 30 Aug 2012 22:42:51 +0000 (15:42 -0700)]
s3:doc Fix name of timeout parameter in documentation

The name is time_audit:timeout, not time_audit:audit_timeout.

Signed-off-by: Christian Ambach <>
7 years agos3:dbwrap_ctdb: Add DB name and key to warning message
Christof Schmitt [Thu, 30 Aug 2012 20:16:24 +0000 (13:16 -0700)]
s3:dbwrap_ctdb: Add DB name and key to warning message

When a operation takes too long, it is useful for debugging to know the
DB and the key.

Signed-off-by: Christian Ambach <>
7 years agos4 dns: Negotiate GSSAPI-based TKEYs
Kai Blin [Thu, 30 Aug 2012 07:04:07 +0000 (09:04 +0200)]
s4 dns: Negotiate GSSAPI-based TKEYs

Autobuild-User(master): Kai Blin <>
Autobuild-Date(master): Fri Aug 31 10:38:35 CEST 2012 on sn-devel-104

7 years agos4-kdc: Give information on how long the password history is
Andrew Bartlett [Fri, 31 Aug 2012 04:02:28 +0000 (14:02 +1000)]
s4-kdc: Give information on how long the password history is

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Fri Aug 31 08:06:17 CEST 2012 on sn-devel-104

7 years agos4-libnet: Fix memory leak of lsa_RefDomainList and lsa_String onto libnet_ctx
Andrew Bartlett [Fri, 31 Aug 2012 02:38:41 +0000 (12:38 +1000)]
s4-libnet: Fix memory leak of lsa_RefDomainList and lsa_String onto libnet_ctx

These are only needed for as long as the call, and should be children of the
private context.

This was found based on a log provided by Ricky Nance
<>.  Thanks Ricky!

Andrew Bartlett

7 years agoauth/credentials: Do not print passwords in a talloc memory dump
Andrew Bartlett [Fri, 31 Aug 2012 01:19:54 +0000 (11:19 +1000)]
auth/credentials: Do not print passwords in a talloc memory dump

The fact that a password was created here is enough information, so
overwrite with the function name and line.

Andrew Bartlett

7 years agoVERSION: Move on to beta9
Andrew Bartlett [Thu, 30 Aug 2012 22:34:03 +0000 (08:34 +1000)]
VERSION: Move on to beta9

We home beta8 will be the last beta, but to avoid confusion and allow
more releases if required I won't mark it as rc1 until the actual
release candidate.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Fri Aug 31 02:07:23 CEST 2012 on sn-devel-104

7 years agoVERSION: Mark as the beta8 release samba-4.0.0beta8
Andrew Bartlett [Thu, 30 Aug 2012 22:32:15 +0000 (08:32 +1000)]
VERSION: Mark as the beta8 release

7 years agoWHATSNEW: prepare for 4.0 beta8
Andrew Bartlett [Thu, 30 Aug 2012 22:31:45 +0000 (08:31 +1000)]
WHATSNEW: prepare for 4.0 beta8

7 years agoThe NTVFS server doesn't pass the SMB1 INHERITFLAGS test.
Jeremy Allison [Thu, 30 Aug 2012 15:45:43 +0000 (08:45 -0700)]
The NTVFS server doesn't pass the SMB1 INHERITFLAGS test.

Autobuild-User(master): Jeremy Allison <>
Autobuild-Date(master): Thu Aug 30 21:38:02 CEST 2012 on sn-devel-104

7 years agoNow ACL inheritance flags are working, add test_inheritance_flags() back into raw...
Jeremy Allison [Wed, 29 Aug 2012 22:18:19 +0000 (15:18 -0700)]
Now ACL inheritance flags are working, add test_inheritance_flags() back into raw.acls to ensure we don't regress.

7 years agoWith the inheritance ACL changes we now pass samba3.smb2.acls.INHERITFLAGS.
Jeremy Allison [Wed, 29 Aug 2012 21:22:33 +0000 (14:22 -0700)]
With the inheritance ACL changes we now pass samba3.smb2.acls.INHERITFLAGS.

7 years agoFix bug #9124 - Samba fails to set "inherited" bit on inherited ACE's.
Jeremy Allison [Wed, 29 Aug 2012 20:44:57 +0000 (13:44 -0700)]
Fix bug #9124 - Samba fails to set "inherited" bit on inherited ACE's.

Change se_create_child_secdesc() to handle inheritance correctly.

7 years agoWindows does canonicalization of inheritance bits. Do the same.
Jeremy Allison [Wed, 29 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Windows does canonicalization of inheritance bits. Do the same.

We need to filter out the
bits. If both are set we store SEC_DESC_DACL_AUTO_INHERITED
as this alters whether SEC_ACE_FLAG_INHERITED_ACE is set
when an ACE is inherited. Otherwise we zero these bits out.

for details.

7 years agoChange the other two places where we set a security descriptor given by the client...
Jeremy Allison [Wed, 29 Aug 2012 20:37:51 +0000 (13:37 -0700)]
Change the other two places where we set a security descriptor given by the client to got through set_sd(),
the canonicalize sd function.

7 years agoRe-add set_sd(), called from set_sd_blob(). Allows us to centralize all ACL canonical...
Jeremy Allison [Wed, 29 Aug 2012 20:29:34 +0000 (13:29 -0700)]
Re-add set_sd(), called from set_sd_blob(). Allows us to centralize all ACL canonicalization.

7 years agoRename set_sd() to set_sd_blob() - this describes what it does.
Jeremy Allison [Wed, 29 Aug 2012 20:23:06 +0000 (13:23 -0700)]
Rename set_sd() to set_sd_blob() - this describes what it does.

7 years agos3:libsmb correctly set isFsctl for snapshot list
Christian Ambach [Thu, 30 Aug 2012 14:43:33 +0000 (16:43 +0200)]
s3:libsmb correctly set isFsctl for snapshot list

FSCTL_GET_SHADOW_COPY_DATA is a FSCTL, so set the isFsctl marker
otherwise smbclient allinfo will not report snapshots any more with the changes
made for Bug #8311

Autobuild-User(master): Christian Ambach <>
Autobuild-Date(master): Thu Aug 30 18:57:24 CEST 2012 on sn-devel-104

7 years agoselftest: Remove spoolss tests from knownfail.
Andreas Schneider [Thu, 30 Aug 2012 11:55:17 +0000 (13:55 +0200)]
selftest: Remove spoolss tests from knownfail.

Autobuild-User(master): Andreas Schneider <>
Autobuild-Date(master): Thu Aug 30 17:17:55 CEST 2012 on sn-devel-104

7 years agoselftest: Add missing printing options for plugin_s4_dc.
Andreas Schneider [Thu, 30 Aug 2012 12:09:49 +0000 (14:09 +0200)]
selftest: Add missing printing options for plugin_s4_dc.

7 years agofile_server: Fix spoolss support with s3fs.
Andreas Schneider [Thu, 30 Aug 2012 13:11:41 +0000 (15:11 +0200)]
file_server: Fix spoolss support with s3fs.

7 years agoselftest: Define the log directory for s3fs.
Andreas Schneider [Thu, 30 Aug 2012 12:09:10 +0000 (14:09 +0200)]
selftest: Define the log directory for s3fs.

7 years agoauth/credentials: Support match-by-key in cli_credentials_get_server_gss_creds()
Andrew Bartlett [Wed, 29 Aug 2012 21:49:21 +0000 (07:49 +1000)]
auth/credentials: Support match-by-key in cli_credentials_get_server_gss_creds()

This allows a password alone to be used to accept kerberos tickets.

Of course, we need to have got the salt right, but we do not need also
the correct kvno.  This allows gensec_gssapi to accept tickets based on
a secrets.tdb entry.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Thu Aug 30 01:26:12 CEST 2012 on sn-devel-104

7 years agos4-torture: Add start of a test to confirm winbindd PAC parsing
Andrew Bartlett [Fri, 24 Aug 2012 00:01:42 +0000 (10:01 +1000)]
s4-torture: Add start of a test to confirm winbindd PAC parsing

So far this confirms that we can accept a ticket using the secrets.tdb

Andrew Bartlett

7 years agolib/krb4_wrap: Add const to kt_copy_one_principal
Andrew Bartlett [Wed, 29 Aug 2012 07:58:45 +0000 (17:58 +1000)]
lib/krb4_wrap: Add const to kt_copy_one_principal

7 years agos3:vfs_gpfs: Use directory not file to get fileset id
Christof Schmitt [Thu, 16 Aug 2012 19:47:52 +0000 (12:47 -0700)]
s3:vfs_gpfs: Use directory not file to get fileset id

The query of the fileset quota needs to determine the file set id first.
With the currently available interface, this requires opening the file
to get a file descriptor. For files, this open can fail when a share
mode is set.

Workaround this by querying the fileset id on the directory instead.

The proper solution would be getting an interface for getting the
fileset id that does not require opening the file.

Autobuild-User(master): Christian Ambach <>
Autobuild-Date(master): Wed Aug 29 18:58:34 CEST 2012 on sn-devel-104

7 years agovfs_media_harmony: fix some compile warnings with llvm
Björn Jacke [Wed, 29 Aug 2012 11:37:05 +0000 (13:37 +0200)]
vfs_media_harmony: fix some compile warnings with llvm

Autobuild-User(master): Björn Jacke <>
Autobuild-Date(master): Wed Aug 29 16:05:10 CEST 2012 on sn-devel-104

7 years agos3-printing: fix bug 9123 lprng job tracking errors
David Disseldorp [Tue, 28 Aug 2012 16:58:24 +0000 (18:58 +0200)]
s3-printing: fix bug 9123 lprng job tracking errors

The lprng printing back-end is truncating the print job filename in the
lpq output, which means that Samba is not able to determine the back-end
job ID for a newly submitted print job.
Remove the unneeded spoolss job ID from the print job file name to
ensure the job filename is not truncated. Also log these warnings at a
higher log level.

Autobuild-User(master): David Disseldorp <>
Autobuild-Date(master): Wed Aug 29 14:25:13 CEST 2012 on sn-devel-104

7 years agolibkrb5: Fix build with MIT Kerberos.
Andreas Schneider [Wed, 29 Aug 2012 08:36:21 +0000 (10:36 +0200)]
libkrb5: Fix build with MIT Kerberos.

Autobuild-User(master): Andreas Schneider <>
Autobuild-Date(master): Wed Aug 29 12:23:37 CEST 2012 on sn-devel-104

7 years agos4-libnet: Fix passing samba_all_enctypes as a fn rather than the encrypt array it...
Andrew Bartlett [Wed, 29 Aug 2012 06:22:24 +0000 (16:22 +1000)]
s4-libnet: Fix passing samba_all_enctypes as a fn rather than the encrypt array it returns

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Wed Aug 29 09:56:27 CEST 2012 on sn-devel-104

7 years agos4-dsdb: Avoid printing secret attributes in ldb trace logs
Andrew Bartlett [Wed, 29 Aug 2012 01:32:26 +0000 (11:32 +1000)]
s4-dsdb: Avoid printing secret attributes in ldb trace logs

These are printed when Samba has debug level 10, which is often used for debugging.

To indicate that these attributes are secret, we set an opaque.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Wed Aug 29 06:04:33 CEST 2012 on sn-devel-104

7 years agolib/ldb: Avoid printing secret attributes in ldb trace logs ldb-1.1.12
Andrew Bartlett [Wed, 29 Aug 2012 01:29:44 +0000 (11:29 +1000)]
lib/ldb: Avoid printing secret attributes in ldb trace logs

These are printed when Samba has debug level 10, which is often used for debugging.

Instead, print a note to say that this attribute has been skipped.

Andrew Bartlett

7 years agoauth/credentials: Remove unused, and un-declared cli_credentials_set_krbtgt()
Andrew Bartlett [Tue, 28 Aug 2012 23:44:52 +0000 (09:44 +1000)]
auth/credentials: Remove unused, and un-declared cli_credentials_set_krbtgt()

7 years agoauth/credentials: Better integrate fetch of secrets.tdb and secrets.ldb records
Andrew Bartlett [Tue, 28 Aug 2012 23:44:12 +0000 (09:44 +1000)]
auth/credentials: Better integrate fetch of secrets.tdb and secrets.ldb records

By checking first if there is a secrets.tdb record and passing in the password and last change time
we avoid setting one series of values and then replacing them.  We also avoid the need to work
around the setting of anonymous.

Andrew Bartlett

7 years agoauth/credentials: Improve memory handling in cli_credentials_set_machine_account
Andrew Bartlett [Tue, 28 Aug 2012 23:21:52 +0000 (09:21 +1000)]
auth/credentials: Improve memory handling in cli_credentials_set_machine_account

By using a tempoary talloc context this is much tidier and more reliable code.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Wed Aug 29 03:11:10 CEST 2012 on sn-devel-104

7 years agoselftest: Add a test for smbclient --machine-pass without secrets.tdb
Andrew Bartlett [Tue, 28 Aug 2012 23:10:40 +0000 (09:10 +1000)]
selftest: Add a test for smbclient --machine-pass without secrets.tdb

Errors in handling the upgrade case without a matching secrets.tdb caused segfaults
in the server.  This essentially tests both sides.

Andrew Bartlett

7 years agoauth/credentials: Avoid double-free in the failure case
Andrew Bartlett [Tue, 28 Aug 2012 23:09:10 +0000 (09:09 +1000)]
auth/credentials: Avoid double-free in the failure case

This pointer is only valid if dbwrap_fetch returned success.

Andrew Bartlett

7 years agos3-smbd: Fix flooding the logs with records we don't find in pcap.
Andreas Schneider [Tue, 28 Aug 2012 12:17:22 +0000 (14:17 +0200)]
s3-smbd: Fix flooding the logs with records we don't find in pcap.

Autobuild-User(master): Andreas Schneider <>
Autobuild-Date(master): Tue Aug 28 16:38:55 CEST 2012 on sn-devel-104

7 years agos3-classicupgrade: Fix import from ldap
Andrew Bartlett [Tue, 28 Aug 2012 01:19:04 +0000 (11:19 +1000)]
s3-classicupgrade: Fix import from ldap

We must not reference result before provision(), and do not need
session_info and lp for reading a normal ldap backend anyway.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Tue Aug 28 09:49:39 CEST 2012 on sn-devel-104

7 years agolib/ldb: Bump ldb version to 1.1.11 ldb-1.1.11
Andrew Bartlett [Tue, 28 Aug 2012 00:00:34 +0000 (10:00 +1000)]
lib/ldb: Bump ldb version to 1.1.11

This will ensure the next Samba release requires an ldb with the recent

Andrew Bartlett

7 years agos3-vfs: Indicate the symlink destination when failing check_reduced_name
Andrew Bartlett [Tue, 3 Jul 2012 03:09:33 +0000 (13:09 +1000)]
s3-vfs: Indicate the symlink destination when failing check_reduced_name

7 years agos3-vfs: Try to be consistent about localtime vs GMT handling in vfs_shadow_copy2
Andrew Bartlett [Mon, 2 Jul 2012 12:31:49 +0000 (22:31 +1000)]
s3-vfs: Try to be consistent about localtime vs GMT handling in vfs_shadow_copy2

With the ability to handle times a abolute time_t values since 1970
this becomes more important to get absolutly correct.

Andrew Bartlett

7 years agos3-vfs_shadow_copy2: Also accept a sscanf result
Andrew Bartlett [Mon, 2 Jul 2012 09:31:58 +0000 (19:31 +1000)]
s3-vfs_shadow_copy2: Also accept a sscanf result

7 years agoVERSION: Move on to beta8
Andrew Bartlett [Mon, 27 Aug 2012 21:43:06 +0000 (07:43 +1000)]
VERSION: Move on to beta8

We actually expect beta7 to be the last beta, but to avoid
confusion I won't mark it as rc1 until the actual release candidate.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <>
Autobuild-Date(master): Tue Aug 28 01:48:16 CEST 2012 on sn-devel-104

7 years agoVERSION: Mark as the beta7 release samba-4.0.0beta7
Andrew Bartlett [Mon, 27 Aug 2012 21:41:11 +0000 (07:41 +1000)]
VERSION: Mark as the beta7 release

7 years agoWHATSNEW: prepare for 4.0 beta7
Andrew Bartlett [Mon, 27 Aug 2012 21:39:36 +0000 (07:39 +1000)]
WHATSNEW: prepare for 4.0 beta7

7 years agoselftest: Fix comment in
Andrew Bartlett [Mon, 27 Aug 2012 12:39:35 +0000 (22:39 +1000)]
selftest: Fix comment in

7 years agos4-classicupgrade: Do the setting of the sysvol ACLs last, after idmap is configured
Andrew Bartlett [Mon, 27 Aug 2012 12:38:53 +0000 (22:38 +1000)]
s4-classicupgrade: Do the setting of the sysvol ACLs last, after idmap is configured

This will allow files to be correctly owned by the idmap that is imported.

This appears to fix an issue that came up after s3fs-compatible ACLs were
merged into provision.

Andrew Bartlett

7 years agos3-passdb: Allow reload of the static passdb from python
Andrew Bartlett [Mon, 27 Aug 2012 12:37:19 +0000 (22:37 +1000)]
s3-passdb: Allow reload of the static passdb from python

This is then used in provision when the passdb backend is forced.

Andrew Bartlett

7 years agoauth/credentials: Rework credentials handling to try and find the most recent machine pw
Andrew Bartlett [Mon, 27 Aug 2012 11:37:19 +0000 (21:37 +1000)]
auth/credentials: Rework credentials handling to try and find the most recent machine pw

As winbindd will update secrets.tdb but not secrets.ldb, we need to detect this and use secrets.tdb

Andrew Bartlett

7 years agoselftest: Add test of smbclient --machine-pass against and using both s3 and s4
Andrew Bartlett [Mon, 27 Aug 2012 11:02:28 +0000 (21:02 +1000)]
selftest: Add test of smbclient --machine-pass against and using both s3 and s4

This uses both smbclient binaries to ensure that both work in both environments.

Andrew Bartlett

7 years agoauth/credentials: Expand secrets.tdb fetch of secrets to preserve workstation and...
Andrew Bartlett [Mon, 27 Aug 2012 11:01:10 +0000 (21:01 +1000)]
auth/credentials: Expand secrets.tdb fetch of secrets to preserve workstation and realm

These would otherwise be set during the fetch from the secrets.ldb, but are wiped when that fails.

Andrew Bartlett

7 years agos4-dsdb: Remove double-free in update_keytab module
Andrew Bartlett [Mon, 27 Aug 2012 09:46:11 +0000 (19:46 +1000)]
s4-dsdb: Remove double-free in update_keytab module

7 years agos4-dsdb: Add secrets_tdb_sync - an ldb module to keep secrets.tdb in sync
Andrew Bartlett [Mon, 27 Aug 2012 09:29:38 +0000 (19:29 +1000)]
s4-dsdb: Add secrets_tdb_sync - an ldb module to keep secrets.tdb in sync

secrets_tdb_sync is a new ldb module designed to sync secrets.ldb
entries with the secrets.tdb file.

While not ideal to keep two copies of this data, this routine will
assist in allowing the samba-tool domain join code to operate
correctly in most cases where winbindd and smbd are used.

Andrew Bartlett

7 years agos3-secrets: Use talloc_stackframe() in secrets_init_path()
Andrew Bartlett [Mon, 27 Aug 2012 09:42:44 +0000 (19:42 +1000)]
s3-secrets: Use talloc_stackframe() in secrets_init_path()

7 years agos3-secrets: Handle all valid ROLE_ values in get_default_sec_channel()
Andrew Bartlett [Mon, 27 Aug 2012 09:28:56 +0000 (19:28 +1000)]
s3-secrets: Handle all valid ROLE_ values in get_default_sec_channel()

7 years agos3-secrets: Add helper function to set machine account password from secrets_tdb_sync
Andrew Bartlett [Mon, 27 Aug 2012 09:28:22 +0000 (19:28 +1000)]
s3-secrets: Add helper function to set machine account password from secrets_tdb_sync

secrets_tdb_sync will be a new ldb module designed to sync secrets.ldb
entries with the secrets.tdb file.

While not ideal to keep two copies of this data, this routine will
assist in allowing the samba-tool domain join code to operate
correctly in most cases where winbindd and smbd are used.

Andrew Bartlett

7 years agolib/krb5_wrap: Move enctype conversion functions into a simple helper file
Andrew Bartlett [Mon, 27 Aug 2012 08:34:02 +0000 (18:34 +1000)]
lib/krb5_wrap: Move enctype conversion functions into a simple helper file

7 years agos4-classicupgrade: Read WINS DB before the provision
Andrew Bartlett [Mon, 27 Aug 2012 07:27:16 +0000 (17:27 +1000)]
s4-classicupgrade: Read WINS DB before the provision

7 years agos4-classicupgrade: Do all the queries of data before the provision()
Andrew Bartlett [Mon, 27 Aug 2012 07:20:51 +0000 (17:20 +1000)]
s4-classicupgrade: Do all the queries of data before the provision()

This allows provision to change the s3 smb.conf settings if required.

Andrew Bartlett

7 years agos4-classicupgrade: Use s3param.get_context() instead of result.lp
Andrew Bartlett [Mon, 27 Aug 2012 06:56:35 +0000 (16:56 +1000)]
s4-classicupgrade: Use s3param.get_context() instead of result.lp

We should not need the guessed values here, but by changing to using the s3 loadparm context
we can move this block to before the provision.

Andrew Bartlett

7 years agolib/krb5_wrap: Move kerberos_enctype_to_bitmap() into krb5_wrap
Andrew Bartlett [Mon, 27 Aug 2012 05:52:47 +0000 (15:52 +1000)]
lib/krb5_wrap: Move kerberos_enctype_to_bitmap() into krb5_wrap

7 years agolib/krb5_wrap: Bring list of all enc types into krb5_wrap
Andrew Bartlett [Mon, 27 Aug 2012 05:51:52 +0000 (15:51 +1000)]
lib/krb5_wrap: Bring list of all enc types into krb5_wrap