1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-15 05:57:49 +03:00

15053 Commits

Author SHA1 Message Date
Andrew Bartlett
14c5f968e1 Rework provision scripts for more testing
This fixes up some issues with testdir (was not honoured) and
increases test coverage.

We now check all the major provision modes.  In doing so, to make it
possible to call from the multiple layers of 'sh', I have allowed 'dc'
to alias 'domain controller' and 'member' to alias 'member server'.
Fighting shell quoting in the test system was just too hard...

Also fix upgrade.py

Andrew Bartlett
(This used to be commit 0923de12282b0e063dd73bc3e056dd5c3663c190)
2008-03-07 10:57:52 +11:00
Andrew Bartlett
45149fbf9d Fixup the NET-API-USERMOD test.
This test needed to be updated to handle the fact that you cannot
clear the ACB_PW_EXPIRED bit, and to always use the torture comment
functions (not printf directly).

Andrew Bartlett
(This used to be commit 2211476bbb3d8e5bca9659e886e559a36f40aff4)
2008-03-07 09:05:24 +11:00
Andrew Bartlett
449c0c5242 Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit a6997c333cdd68dfba8a069df448836ff487787f)
2008-03-07 07:38:44 +11:00
Andrew Bartlett
8b24d248b7 Start to rework provision for LDAP backends
This is the start of the rework of the provision script to handle an
LDAP backend correctly.  For example, we must not set the 'tdb
modules' against an LDAP backend such as OpenLDAP that handles subtree
renames.

Andrew Bartlett
(This used to be commit e462a107d3bafcc546ca4d53dcc8eb32e4280745)
2008-03-07 07:33:14 +11:00
Günther Deschner
7eaa6b5f9a Ignore Kerberos PAC type 12.
Until we worked out the PAC_TYPE_UNKNOWN_12 format (or received documentation)
ignore it so that the PAC parsing can proceed.

Guenther
(cherry picked from commit 3630ec26c99fdea46c47117d026f9bffb2c4590a)
(This used to be commit 0c1ccbc183c1d2967da2d9a17033f3b116ff7387)
2008-03-06 17:40:25 +01:00
Günther Deschner
62af65d1e3 Slowly making progress on PAC_UNKNOWN_12.
unknown1 and unknown2 are offset headers for the strings.

Guenther
(cherry picked from commit 7af70e75b9abf92921f33ec4207ad486ee2493d6)
(This used to be commit ad19da7f83761948f379921560da34bb6a01e625)
2008-03-06 17:40:16 +01:00
Günther Deschner
74dba5e33c Add new Windows 2008 Kerberos PAC Type 12 (apparently again undocumented).
We need at least to parse this in order to correctly support kerberized session
setup from w2k8 as well as local pam_winbind logons using kerberos.

Guenther
(cherry picked from commit 4ba62d49d740c43cf17ceef1534cf1c8a7e4a130)
(This used to be commit ef0971206cda598e6bfad2ff06a3d2e9e8131682)
2008-03-06 17:40:05 +01:00
Stefan Metzmacher
e24d47ec2e RAW-OPLOCK: rename _ack_to_levelII() -> ack_to_given()
Also improve the output.

metze
(This used to be commit d0b641a9ee36939468beb427bf6b15892342a33d)
2008-03-06 17:19:43 +01:00
Stefan Metzmacher
4bfc32b160 RAW-OPLOCK: add BATCH24 test another case with a connection with no CAP_LEVEL_II_OPLOCKS
metze
(This used to be commit 4fb2c9fb1f4e3ee23281ca83f8b91d252cbf53c7)
2008-03-06 17:19:43 +01:00
Stefan Metzmacher
80104efb58 RAW-OPLOCK: add BATCH23 and test with a connection with no CAP_LEVEL_II_OPLOCKS
metze
(This used to be commit 2192d6d2bda2afd2ba1ed0cb68bdfe590b9d50af)
2008-03-06 17:19:36 +01:00
Stefan Metzmacher
bc9bb918a1 RAW-OPLOCK: remove unused vars
metze
(This used to be commit 0905f3ebd1cb1ac9cefc4272208add9e5a8d7f59)
2008-03-06 17:19:34 +01:00
Stefan Metzmacher
ef4ae2597d pvfs_open: pass down allow_level_II_oplock to odb_open_file()
metze
(This used to be commit 7c9b269b0742d435055e21f7e6cc945c21c7e332)
2008-03-06 17:19:26 +01:00
Stefan Metzmacher
b7db5f7cb5 opendb: add allow_level_II_oplock parameter to odb_open_file()
Not all clients support a fallback to level II oplocks.

metze
(This used to be commit 146f1fe0b67ca0805f0e71358abc57da0c0579a9)
2008-03-06 17:19:12 +01:00
Stefan Metzmacher
0339ae5ad8 pvfs_open: fix crash/leak in case pvfs_setup_oplock() fails
metze
(This used to be commit 5563238782e825f64a22b5f9e0a7deb687f50b19)
2008-03-06 16:31:26 +01:00
Stefan Metzmacher
87f2925252 ntvfs: pass down the client capabilities into the ntvfs layer
Note that we don't use any protocol specific values here.

For now only NTVFS_CLIENT_CAP_LEVEL_II_OPLOCKS is defined
others should be defined, when we find out that the ntvfs
layer needs to know about it.

metze
(This used to be commit cc42cd5f6753ca582677fa6f403f0419eec5ab10)
2008-03-06 16:31:25 +01:00
Stefan Metzmacher
3cbe47b2ae libcli/raw: make it possible to not send CAP_LEVEL_II_OPLOCKS
But the keep the default to always send it
when the server supports it too.

metze
(This used to be commit 33caaef2e46557525a8ffb79d6dd0db46a079529)
2008-03-06 16:31:25 +01:00
Andrew Bartlett
c24329dc07 Fix typo
(This used to be commit e66be2f519584717abd7fc1f069bf7afe0d7ff60)
2008-03-06 22:04:46 +11:00
Andrew Bartlett
85bf2abee0 Ensure we get this option from the command line, not the internal
smb.conf we generate.

Andrew Bartlett
(This used to be commit 25887c87285b1b92ce5d7cc096da483c25a2fe6c)
2008-03-06 22:03:10 +11:00
Andrew Bartlett
eacf38cdb6 Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 2232255ce384433ff9626f2fd3d399f758b0add5)
2008-03-06 22:02:25 +11:00
Andrew Bartlett
7e0ef3fd0e Make Samba4 pass the NET-API-BECOMEDC test against Win2k3 (again).
To make Samba4, using the python provision system, pass this test
required some major rework.  Untested code is broken code, and some of
the refactoring for a seperate provision test (which also now passes)
broke things.

Similarly, the iconv work has compiled, but these codepaths have never
been run (NULL pointer de-reference).

In working to use a local, rather than global, loadparm context, and
to support using a target directory, a few things needed to be
reworked, particularly around path handling.

Andrew Bartlett
(This used to be commit 1169e8d7bee20477b0efbfea3534ac63c83fb3d6)
2008-03-06 21:55:26 +11:00
Andrew Kroeger
0e50fb5e91 ldb_wrap: Debug at derived samba_level, not the level of the ldb debug enum.
(This used to be commit eb9a7c3b3a7f113ff58e2ebea9886f997da4e085)
2008-03-06 00:07:26 -06:00
Stefan Metzmacher
cdafdaa0d9 selftest: use the same oplocktimeout for smbtorture as for smbd
metze
(This used to be commit 18e27aef7be9b21f65f72ab4c656778ce0c23953)
2008-03-04 14:40:56 +01:00
Stefan Metzmacher
8ff6647d29 RAW-OPLOCK: add BATCH22 and test the behavior of oplock break timeouts
metze
(This used to be commit c459885898c9912df1ae5afff4fef2ff809dc15e)
2008-03-04 14:40:56 +01:00
Stefan Metzmacher
13764eb02d RAW-OPLOCK: add BATCH21: a self write with an oplock doesn't break it
metze
(This used to be commit a5476ee41c140123db160b2e36c8c7084619a738)
2008-03-04 14:40:51 +01:00
Stefan Metzmacher
eb26c896a2 pvfs_oplock: auto release oplocks after a timeout
Remember that we sent an oplock break to
a client and don't resend. If the filesystem
layer tries to send a new break and the client
has not released after a former oplock break
after the timeout interval, we need to auto release
the oplock.

metze
(This used to be commit bfb0888578677856b2b6b72471f542d0d5d7b838)
2008-03-04 14:40:50 +01:00
Stefan Metzmacher
1f5301c1d2 pvfs_oplock: only a break level2 oplocks...
It seems that I've tested this in the wrong way before.

metze
(This used to be commit 21772fa33d772a9df6ff04a0ed1b0d8f4f533295)
2008-03-04 14:40:50 +01:00
Stefan Metzmacher
af0d863ce7 pvfs_oplock: move pvfs_oplock_release() parts into a helper function
metze
(This used to be commit 2b8934e4ab2dd9673928a6c9a291aedac1ebaa95)
2008-03-04 14:40:49 +01:00
Stefan Metzmacher
3ced8006a6 build: fix the build with --enable-automatic-dependencies=yes
metze
(This used to be commit b0ecd8f8d2c1ebf23957921f4852e90b556812fc)
2008-03-04 11:55:41 +01:00
Andrew Bartlett
f042c15090 Try to return sane ldb error strings
We don't just want to return just strerror(ret) when things go wrong.

Andrew Bartlett
(This used to be commit 7f0341dd589150ab01563957460cdcf42515cadc)
2008-03-04 13:45:31 +11:00
Andrew Bartlett
8a10979e6b The DN in objectCategory should, if possible, be returned pretty...
This avoids going via the canonicalise_fn(), which will upper case the DN

Andrew Bartlett
(This used to be commit cdff1b0802437d713652b89f4522d3cce97c30ec)
2008-03-04 13:40:50 +11:00
Andrew Bartlett
736ae6a566 Don't hardcode objectCategory into the schema, even in the schema.
We now load the schema early enough that we can generate this too!

Andrew Bartlett
(This used to be commit 1adc74c65a3219fc110964ccdf9a9d60a84831da)
2008-03-04 11:27:57 +11:00
Andrew Bartlett
4d4a898742 Fix failure to re-provision.
Somewhere in the conversion from ejs we lost calling the 'delete
partitions' code.  However, we have to be careful not to wipe
partitions when we are the second client connecting to an LDAP server.

Andrew Bartlett
(This used to be commit 272eb765b81e3eab216a07249334f9b7d20e530b)
2008-03-03 13:03:19 +11:00
Andrew Bartlett
4550c3f470 Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit de1784ec4d50f6eec24b1e9e488b5c07833dc1fd)
2008-03-03 11:12:20 +11:00
Douglas VanLeuven
c20cf59768 Fix member server provision
Can't add "member server" because the script aborts with null
reference when no match on serverrole.  This is fixed by checking for
the keyword "member server".
(This used to be commit 62536750ae06248a49c6b56c86d01b0062bb54f0)
2008-03-03 11:08:59 +11:00
Jelmer Vernooij
a1ff86dbab Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11)
2008-03-03 00:40:01 +01:00
Jelmer Vernooij
c7dc53b851 Merge branch 'v4-0-test' into id10ts-registry
(This used to be commit f98b59021a5ea39c7970ebc5520d17775e500b8c)
2008-03-03 00:23:09 +01:00
Andrew Kroeger
2db6aec31f Fix blackbox.kinit test by issuing new certificates good for 25 years.
(This used to be commit 4f40c5940b4aa4343152cf367566d4d26765e234)
2008-03-02 07:57:13 -06:00
Brad Hards
85d53f7b60 Some cleanups for the ldb doxygen docs.
(This used to be commit 5972308add8b1078e190beab204c1ba4b3a25747)
2008-03-02 10:46:47 +01:00
Jelmer Vernooij
830051b494 Remove unused variable, fix (80, 'Other error') exceptions from ldb python bindings
(This used to be commit 2303063cbd2e65580618124ef8ecf42867d2b952)
2008-03-01 21:18:12 +01:00
Jelmer Vernooij
748f1c0962 Fix error handling in ldb.add().
(This used to be commit a7f89b5bb28601597a4a0f75ec2b97bac02370d9)
2008-03-01 13:01:02 +01:00
Jelmer Vernooij
e580c5c904 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit cfd1a91c6e319bc28a60bb6aae4443b1246500cb)
2008-03-01 12:23:08 +01:00
Stefan Metzmacher
0de1a63c18 pvfs_rename: move odb_rename() onto pvfs_do_rename()
metze
(This used to be commit 5a1f0c0ce995064c23e9f726bceddbd8442c4293)
2008-03-01 10:29:56 +01:00
Jelmer Vernooij
98db647343 Remove duplicate message.
(This used to be commit 87074881a926f6216276ebc263047c1ffb8aee10)
2008-02-29 17:04:57 +01:00
Jelmer Vernooij
2bb8e49a7e Fix variable name.
(This used to be commit b5db8defcae0a718e5239e8c7705c9bf6eb431ec)
2008-02-29 15:47:04 +01:00
Jelmer Vernooij
7071276c65 Simpler handling of sonameflag.
(This used to be commit 1e786bb7da689c3aa435e92975f33db5a308b6a7)
2008-02-29 15:41:26 +01:00
Jelmer Vernooij
bb176a124e Move automatic dependencies code out of perl code.
(This used to be commit 58a93ef94b878ff2d2d0029fc2d443551842e712)
2008-02-29 15:39:44 +01:00
Jelmer Vernooij
21b54de82f Allow absolute paths to be specified to mkproto.pl.
(This used to be commit 46d8d02028869c97226648113d6bff1c06477d61)
2008-02-29 15:39:32 +01:00
Jelmer Vernooij
9817a66733 Use special make variables.
(This used to be commit dfb4ddcd5dbd27d275e7a41ede5441be25db9a35)
2008-02-29 15:39:18 +01:00
Jelmer Vernooij
3067428a8f Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 18c683d7e804e76ac37d4069429b5ba1a9d9ae38)
2008-02-29 15:34:45 +01:00
Jelmer Vernooij
232d51e666 Remove useless include, simplify generated CFLAGS lines in Makefile.
(This used to be commit 3157ce9876aa69de54acf3f08e0ee2b16cfaff80)
2008-02-29 15:32:33 +01:00