samba.git
15 years agoFix profile acls in some corner cases
Simo Sorce [Wed, 22 Apr 2009 13:12:58 +0000 (09:12 -0400)]
Fix profile acls in some corner cases

Always add back the real original owner of the directory in the ACE List after
we steal its ACE for the Administrators group.
(cherry picked from commit 5d8f374ad75e06354ac27f34e3f44b3d459ac2ef)

15 years agoAvoid duplicate aces
Simo Sorce [Wed, 22 Apr 2009 10:15:21 +0000 (06:15 -0400)]
Avoid duplicate aces

When adding arbitrary aces to an nt_ace_list we need to make sure we
are not actually adding a duplicate.
add_or_replace_ace() takes care of doing the right thing.
(cherry picked from commit 89dfbdba515b5be32f535a112a7f1019884aa651)

15 years agoAdd comment explaining the previous fix.
Jeremy Allison [Wed, 22 Apr 2009 10:03:04 +0000 (03:03 -0700)]
Add comment explaining the previous fix.
Jeremy.
(cherry picked from commit 0b0bb2c7eb44b403e6fd50cf480ed8b2fb24a7d5)

15 years agoFix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but...
Jeremy Allison [Wed, 22 Apr 2009 09:54:11 +0000 (02:54 -0700)]
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit 9ebc15bed8c05d0729066d97d3bfaade9fcbacb7)

15 years agos3-secdesc: remove SEC_RIGHT_MAXIMUM_ALLOWED and SEC_RIGHT_SYSTEM_SECURITY.
Günther Deschner [Tue, 21 Apr 2009 11:01:29 +0000 (13:01 +0200)]
s3-secdesc: remove SEC_RIGHT_MAXIMUM_ALLOWED and SEC_RIGHT_SYSTEM_SECURITY.

We had up to three incarnations of these flags in Samba3.

Guenther
(cherry picked from commit d94bbb3167f3a18d6b8a311557f228e2977249ea)
(cherry picked from commit b0c4be0e2b856326e5790f4aef54e6b792f8f089)

15 years agos3-secdesc: move all winreg access bits to IDL.
Günther Deschner [Tue, 14 Apr 2009 23:30:12 +0000 (01:30 +0200)]
s3-secdesc: move all winreg access bits to IDL.

Guenther
(cherry picked from commit 38264bb3b86a3c9da941070f29ec08227c471d2b)
(cherry picked from commit 904bc5011fc7df40111f493ff28972640b95c0d1)

15 years agos3-secdesc: use SEC_FLAG_SYSTEM_SECURITY instead of SEC_RIGHT_SYSTEM_SECURITY.
Günther Deschner [Tue, 14 Apr 2009 23:19:30 +0000 (01:19 +0200)]
s3-secdesc: use SEC_FLAG_SYSTEM_SECURITY instead of SEC_RIGHT_SYSTEM_SECURITY.

Guenther
(cherry picked from commit da92e54236293460e307edd52ca7f1e20c6f23ef)
(cherry picked from commit 3e9ee3fa54b514987f40a477b3049b18e87390e9)

15 years agos3-secdesc: use SEC_FLAG_MAXIMUM_ALLOWED instead of SEC_RIGHT_MAXIMUM_ALLOWED.
Günther Deschner [Tue, 14 Apr 2009 23:16:41 +0000 (01:16 +0200)]
s3-secdesc: use SEC_FLAG_MAXIMUM_ALLOWED instead of SEC_RIGHT_MAXIMUM_ALLOWED.

Guenther
(cherry picked from commit 1bb093aea9a4c5996514b10adc39a130cc6859ba)
(cherry picked from commit 2f691302b3fe6b5b710b228ae149e0807ef5d5dc)

15 years agos3-secdesc: use SEC_FLAG_MAXIMUM_ALLOWED instead of SEC_RIGHTS_MAXIMUM_ALLOWED.
Günther Deschner [Tue, 14 Apr 2009 23:12:13 +0000 (01:12 +0200)]
s3-secdesc: use SEC_FLAG_MAXIMUM_ALLOWED instead of SEC_RIGHTS_MAXIMUM_ALLOWED.

Guenther
(cherry picked from commit b5bec1a6d73f5939b306e157937d027a7286163c)
(cherry picked from commit c7d5e0a19057b6ad7301a390fc766bb438967eb2)

15 years agoAdded ability to revert to old modules for make revert.
John H Terpstra [Mon, 20 Apr 2009 15:10:20 +0000 (10:10 -0500)]
Added ability to revert to old modules for make revert.
(cherry picked from commit e39255311a61897c53e00cc27df65790f83e132b)

15 years agoDo not use the file system GET_REAL_FILENAME for mangled names
Volker Lendecke [Wed, 15 Apr 2009 11:01:09 +0000 (13:01 +0200)]
Do not use the file system GET_REAL_FILENAME for mangled names
(cherry picked from commit c8cc6da0ab4441ce7b22cf00eed05290e91530c4)

15 years agos3-printing: use ARRAY_SIZE() macro in forms functions.
Günther Deschner [Fri, 17 Apr 2009 22:58:12 +0000 (00:58 +0200)]
s3-printing: use ARRAY_SIZE() macro in forms functions.

Guenther
(cherry picked from commit 62480385c1e551448e40b01fff8e9dee318c29c1)
(cherry picked from commit fea535368e4d62606b522031afc773d4963dbb91)

15 years agos3-printing: use sec_initial_uid() instead "0" in print_access_check().
Günther Deschner [Sun, 19 Apr 2009 22:57:53 +0000 (00:57 +0200)]
s3-printing: use sec_initial_uid() instead "0" in print_access_check().

Another babystep in order to make us pass RPC-SPOOLSS.

Guenther
(cherry picked from commit d9aaf3759ac7fd6ce07a347a0138bdfb27a6f929)
(cherry picked from commit 63d4f5a5893dfcf8ff346bad100e8bd7052089ee)

15 years agos4-smbtorture: test all levels in test_GetJob().
Günther Deschner [Mon, 13 Apr 2009 21:56:59 +0000 (23:56 +0200)]
s4-smbtorture: test all levels in test_GetJob().

Guenther
(cherry picked from commit 5f0c9c57f53f9b0026b4f58f68442a72103c0d7d)
(cherry picked from commit feec2a814ee09800c26ae4c1f637796737b7ad2a)

15 years agos3-spoolss: remove some direct checks for 0 uid in AddForm,SetForm,DelForm.
Günther Deschner [Fri, 17 Apr 2009 21:18:24 +0000 (23:18 +0200)]
s3-spoolss: remove some direct checks for 0 uid in AddForm,SetForm,DelForm.

Also add some become_root()/unbecome_root() pairs which were missing IMHO.

Guenther
(cherry picked from commit 81b18464be170528d5e1549868bcbddbbcd60e1e)
(cherry picked from commit 6689b0da85ac3b2f146c5e9851b73cf7d1e21c2b)

15 years agos3-selftest: enable RPC-SPOOLSS.
Günther Deschner [Mon, 13 Apr 2009 22:01:21 +0000 (00:01 +0200)]
s3-selftest: enable RPC-SPOOLSS.

Guenther
(cherry picked from commit 6f90cdaf63b5b584c96b9ffc388c9e8df172db67)
(cherry picked from commit 4677976a2081e4384b61d163d104c651e7a1f569)

15 years agos4-smbtorture: Skip Job pause and resume on paused printers for Samba 3 for now.
Günther Deschner [Fri, 17 Apr 2009 15:21:19 +0000 (17:21 +0200)]
s4-smbtorture: Skip Job pause and resume on paused printers for Samba 3 for now.

Guenther
(cherry picked from commit fe2828c3536eac18902a059049dd12b9b103f731)
(cherry picked from commit 4c3b05d8486ddff87ed665d9b37f6bc47fc2a96b)

15 years agos4-smbtorture: rework test_EnumPrinterDrivers() a little to succeed with s3.
Günther Deschner [Fri, 17 Apr 2009 15:19:38 +0000 (17:19 +0200)]
s4-smbtorture: rework test_EnumPrinterDrivers() a little to succeed with s3.

Yes, I feel dirty for this but promise to come back and fix appropriately.

Guenther
(cherry picked from commit cb9c0cefaf61cf2c03f92a212dbf6673caa755dd)
(cherry picked from commit f070e1d305f1b5abc9bc8f87ed552dbf9c1ea293)

15 years agos4-smbtorture: Fix RPC-SPOOLSS-WIN for printers with a lot of jobs in the queue.
Günther Deschner [Fri, 17 Apr 2009 15:14:20 +0000 (17:14 +0200)]
s4-smbtorture: Fix RPC-SPOOLSS-WIN for printers with a lot of jobs in the queue.

Guenther
(cherry picked from commit 81253ec14623ed480905433e5bf5df7982cfbfa4)
(cherry picked from commit 17c2e74370a9f748e33371c2a15597c415b50c1e)

15 years agos3:docs: document the --request-timeout option of net
Stefan Metzmacher [Fri, 3 Apr 2009 10:21:17 +0000 (12:21 +0200)]
s3:docs: document the --request-timeout option of net

metze
(cherry picked from commit cdbbc81bad5d53397bf80898cf68d8867cf64cba)
(cherry picked from commit 1d1e859c4e08fed1775a170ccff459f3a18e13ba)

15 years agos3:net: add --request-timeout option
Stefan Metzmacher [Thu, 26 Mar 2009 19:32:55 +0000 (20:32 +0100)]
s3:net: add --request-timeout option

metze
(cherry picked from commit 257809558bfab3e45703cf8be76357596392a3ea)
(cherry picked from commit e20b8706401d1a4eee0fe494825deef6ab23ab23)

15 years agos3:net_rpc: don't shutdown a cli_state passed from the caller
Stefan Metzmacher [Thu, 26 Mar 2009 19:29:24 +0000 (20:29 +0100)]
s3:net_rpc: don't shutdown a cli_state passed from the caller

This fixes a crash bug if we timeout in net rpc trustdom list.

metze
(cherry picked from commit c0dfe0cf80ee50f395912b7d6aec0d87febd34c0)
(cherry picked from commit d87563604ca7b1c18c5a84d76726c2a99dc454f8)

15 years agos3: make installmo and uninstallmo scripts executable
Michael Adam [Fri, 17 Apr 2009 13:53:38 +0000 (15:53 +0200)]
s3: make installmo and uninstallmo scripts executable

Michael
(cherry picked from commit 9deb558c5a3c380c7e4964e6fd2fc1b948115078)

15 years agos3: Fix uninstallmo
Michael Adam [Fri, 17 Apr 2009 13:29:10 +0000 (15:29 +0200)]
s3: Fix uninstallmo

Michael
(cherry picked from commit 81dca118cd94988f55a5b4c43436a97d04309b48)

15 years agos3-selftest: samba 3 also passes RPC-JOIN so enable it.
Günther Deschner [Fri, 17 Apr 2009 13:13:33 +0000 (15:13 +0200)]
s3-selftest: samba 3 also passes RPC-JOIN so enable it.

Guenther
(cherry picked from commit 4f9d3400e5aa310e8071c0bb5d62ddaed1d846ee)
(cherry picked from commit c33e3b84a706fa429ceeea81fb17c434e8f6cb4e)

15 years agos3:registry: Prevent creation of keys containing the '/' character.
Michael Adam [Fri, 17 Apr 2009 09:40:17 +0000 (11:40 +0200)]
s3:registry: Prevent creation of keys containing the '/' character.

This creates a broken registry that can only be fixed with
tdbtool, since the '/' sign is used as a key separator after
normalization at a lower level.

This makes e.g. "net conf setparm abc/def comment xyz" fail with
WERR_INVALID_PARAM, which is much more desirable than a broken
registry.tdb.

Michael
(cherry picked from commit 74385e90fa72b132088861d864cb275909ed7f6f)

15 years agos3-samr: set the builtin_domain bool flag in get_samr_dispinfo_by_sid().
Günther Deschner [Fri, 17 Apr 2009 09:21:20 +0000 (11:21 +0200)]
s3-samr: set the builtin_domain bool flag in get_samr_dispinfo_by_sid().

Volker, please check.

Found by torture test RPC-SAMR-PASSWORDS-PWDLASTSET (which we pass with
this fix).

Guenther
(cherry picked from commit 0ba833f3eedff5dec272eb71f3b09becd8707156)
(cherry picked from commit 4c8d90a077901f7901b8202abed54746679aa3a9)

15 years agos3-selftest: enable RPC-SAMR-PASSWORDS-PWDLASTSET whilte testing Samba3.
Günther Deschner [Fri, 17 Apr 2009 09:14:14 +0000 (11:14 +0200)]
s3-selftest: enable RPC-SAMR-PASSWORDS-PWDLASTSET whilte testing Samba3.

Guenther
(cherry picked from commit 490f6c418d8b1280d0a3b85773a72b2047122c12)
(cherry picked from commit 7f6094fe8238f7a146fe7c45ab31f0e2244704bd)

15 years agos4-smbtorture: disable CreateUser2 tests when running RPC-SAMR-PASSWORDS-PWDLAST
Günther Deschner [Fri, 17 Apr 2009 09:04:44 +0000 (11:04 +0200)]
s4-smbtorture: disable CreateUser2 tests when running RPC-SAMR-PASSWORDS-PWDLAST
against Samba3.

Samba 3 does not (yet) get all the ACB_flag settings right upon creation.

Guenther
(cherry picked from commit 32add69632ed4a2b877043c8df1185008516c299)
(cherry picked from commit 93f4a4f89448f33dbcf67ebb92fd94e65579b3c4)

15 years agos3-docs: fix typo in smb.conf.5.
Günther Deschner [Thu, 16 Apr 2009 23:30:54 +0000 (01:30 +0200)]
s3-docs: fix typo in smb.conf.5.

Guenther
(cherry picked from commit 05ea8daacabe62b6c20770a8518192c44e7eb763)
(cherry picked from commit edf797fb614271c17bc005a661af8c8e8b913d81)

15 years agos3-selftest: enable RPC-LSA-LOOKUPSIDS against samba 3.
Günther Deschner [Thu, 16 Apr 2009 23:30:16 +0000 (01:30 +0200)]
s3-selftest: enable RPC-LSA-LOOKUPSIDS against samba 3.

Guenther
(cherry picked from commit deb719a62e0909d476b9817c45a32766dc9709d7)
(cherry picked from commit cfb5e97b88aae1780b5ef14baa15d9c692d157ab)

15 years agos4-smbtorture: add LSA-LOOKUPSIDS to verify bug #6263.
Günther Deschner [Thu, 16 Apr 2009 23:28:41 +0000 (01:28 +0200)]
s4-smbtorture: add LSA-LOOKUPSIDS to verify bug #6263.

Guenther
(cherry picked from commit c794ba71b762676c1cfe1eba40b4a254f16ad06a)
(cherry picked from commit e9af8e25f2c65decaf1a9e3c452c1a4c38042b48)

15 years agos4-smbtorture: Fix crash in RPC-LSA-LOOKUP
Günther Deschner [Thu, 16 Apr 2009 23:26:40 +0000 (01:26 +0200)]
s4-smbtorture: Fix crash in RPC-LSA-LOOKUP

Guenther
(cherry picked from commit b0a0d2a0ae16929efa392705c3d7823da16f4d55)
(cherry picked from commit a0c16dbb46ef334126db771d7adb908d822eac6d)

15 years agos3-docs: document warn_pwd_expire pam_winbind option in manpage.
Günther Deschner [Thu, 16 Apr 2009 11:03:35 +0000 (13:03 +0200)]
s3-docs: document warn_pwd_expire pam_winbind option in manpage.

Andreas, please check.

Guenther
(cherry picked from commit 5517c0bcddfbd8c877fd1f909407824553a20e7f)
(cherry picked from commit ed95e2978dd8b3c4a7e72569419748156ab5c760)

15 years agoAdd torture tester to ensure we don't regress the ulogoff bug.
Jeremy Allison [Thu, 16 Apr 2009 23:21:31 +0000 (16:21 -0700)]
Add torture tester to ensure we don't regress the ulogoff bug.
Jeremy.
(cherry picked from commit 4ee6b7934e91b87122ff7bad4c89a0ab9bdd3bf0)

15 years agoFix bug found by Tim Prouty, logging off and then re-using a vuid can cause smbd to
Jeremy Allison [Thu, 16 Apr 2009 23:19:10 +0000 (16:19 -0700)]
Fix bug found by Tim Prouty, logging off and then re-using a vuid can cause smbd to
access a freed structure.
Jeremy.
(cherry picked from commit e023058f5b774ddbb61e8187aa7dbd2e6e25804d)

15 years agoWhen doing a cli_ulogoff don't invalidate the cnum, invalidate the vuid.
Jeremy Allison [Thu, 16 Apr 2009 22:15:10 +0000 (15:15 -0700)]
When doing a cli_ulogoff don't invalidate the cnum, invalidate the vuid.
Jeremy.
(cherry picked from commit be46b98ee38e17e4561ab58fe9b6ecc6b7919392)

15 years agoDon't look up local user for remote changes, even when root.
Jim McDonough [Thu, 16 Apr 2009 15:14:20 +0000 (17:14 +0200)]
Don't look up local user for remote changes, even when root.
(cherry picked from commit 583d7c97bb5f9b62fab17ce2466442ece648331f)

15 years agofix the build of net: dos_errstr is replaced by win_errstr...
Michael Adam [Thu, 16 Apr 2009 09:13:24 +0000 (11:13 +0200)]
fix the build of net: dos_errstr is replaced by win_errstr...

I had the patch locally but forgot to commit before pushing - sorry...

Michael
(cherry picked from commit 986a36fd30f7f65c7ef79b945f7b95014872f30f)

15 years agoIn net_conf_import, start a transaction when importing a single share.
Martin Schwenke [Thu, 16 Apr 2009 00:25:29 +0000 (10:25 +1000)]
In net_conf_import, start a transaction when importing a single share.

Commit d69c3db9d44ad5d9fd1f5d7a9499f3bd79ecfb47 caused the transaction
start to be conditional but the commit is still unconditional, so an
error occurs when importing a single share.

An alternate fix would be to return the transaction start to be
unconditional but then it would occur before other error checking.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit e344341ddd46e45b2ecdaf604cdd5d64adab6343)

15 years agos3-lsa: Fix Bug #6263. Unexpected LookupSids reply crashes XP pre-SP3.
Günther Deschner [Wed, 15 Apr 2009 23:42:35 +0000 (01:42 +0200)]
s3-lsa: Fix Bug #6263. Unexpected LookupSids reply crashes XP pre-SP3.

LookupSids needs to bounce back string sids in case of NT_STATUS_NONE_MAPPED.

Guenther
(cherry picked from commit 1c9266c8caa59e287b993393b6050732a0b33547)

15 years agoFix bug #6089 - Winbind samr_OpenDomain not possible with Samba 3.2.6+
Jeremy Allison [Wed, 15 Apr 2009 22:40:00 +0000 (15:40 -0700)]
Fix bug #6089 - Winbind samr_OpenDomain not possible with Samba 3.2.6+
What a difference a name makes... :-). Just because something is missnamed
SAMR_ACCESS_OPEN_DOMAIN, when it should actually be SAMR_ACCESS_LOOKUP_DOMAIN,
don't automatically use it for a security check in _samr_OpenDomain().
Jeremy.
(cherry picked from commit 1994a8a5db5c3abd6292b81aa975e7b8fe8311d0)

15 years agos4-smbtorture: Fix crash bugs in RPC-SAMR_ACCESSMASK.
Günther Deschner [Wed, 15 Apr 2009 20:47:15 +0000 (22:47 +0200)]
s4-smbtorture: Fix crash bugs in RPC-SAMR_ACCESSMASK.

Also disable security descriptor based tests while testing samba3.

Guenther
(cherry picked from commit e6aa3f2d09bd004341dde28b15ef769a09401f26)
(cherry picked from commit 148fa23d95af164babd9135fc40d528ec147e372)

15 years agos3-examples: make sure to match correct key name in adssearch.
Günther Deschner [Wed, 15 Apr 2009 15:07:48 +0000 (17:07 +0200)]
s3-examples: make sure to match correct key name in adssearch.

Guenther
(cherry picked from commit 6fe012ff78caf10f4bf5503b27030cd54563ad0b)
(cherry picked from commit 6afb9614381f926b590c627f44cf5a93e11068ec)

15 years agos4-smbtorture: define TORTURE_DEFAULT_SERVICE and set to netlogon.
Günther Deschner [Tue, 14 Apr 2009 21:30:13 +0000 (23:30 +0200)]
s4-smbtorture: define TORTURE_DEFAULT_SERVICE and set to netlogon.

Guenther
(cherry picked from commit f1fd39c09f0e094c882775367b1e4c5772d7ee51)
(cherry picked from commit 9c914cf1bd4ce2d7abba6a4e94e393cb930f259e)

15 years agos3/WHATSNEW: Rewording.
Karolin Seeger [Wed, 15 Apr 2009 09:05:22 +0000 (11:05 +0200)]
s3/WHATSNEW: Rewording.

Karolin
(cherry picked from commit db49a0cf2c9b9b108ec10d9b962026032910f4e4)

15 years agos3/WHATSNEW: Add tevent to the list of internal changes.
Karolin Seeger [Wed, 15 Apr 2009 08:49:07 +0000 (10:49 +0200)]
s3/WHATSNEW: Add tevent to the list of internal changes.

Karolin
(cherry picked from commit 83a9cbece9d1f3141c4f6bf7586a80f0eae6e37f)

15 years agos3/WHATSNEW: Correct description.
Karolin Seeger [Wed, 15 Apr 2009 08:20:07 +0000 (10:20 +0200)]
s3/WHATSNEW: Correct description.

Karolin
(cherry picked from commit 459aa55885edc03707d58eedd15bd54227729bee)

15 years agos3/WHATSNEW: Add Günther's spools conversion.
Karolin Seeger [Wed, 15 Apr 2009 08:11:22 +0000 (10:11 +0200)]
s3/WHATSNEW: Add Günther's spools conversion.

Karolin
(cherry picked from commit d8de3f43ef4d4e399c4c55fd9738539f0ff97145)

15 years agoRemove the so-far unused lua-stuff for the 3.4 release
Volker Lendecke [Wed, 15 Apr 2009 07:51:20 +0000 (09:51 +0200)]
Remove the so-far unused lua-stuff for the 3.4 release
(cherry picked from commit 0349dad1633cd9574e0d8c7d2054e4c7dd0fdc21)

15 years agos3/configure: Disable the automatic merged build.
Karolin Seeger [Wed, 15 Apr 2009 07:52:23 +0000 (09:52 +0200)]
s3/configure: Disable the automatic merged build.

Karolin
(cherry picked from commit 3b028d8609d29de2610d1c91d3098aa6002b90c4)

15 years agos3/WHATSNEW: Add some more Franky specific stuff.
Karolin Seeger [Wed, 15 Apr 2009 07:51:45 +0000 (09:51 +0200)]
s3/WHATSNEW: Add some more Franky specific stuff.

Karolin
(cherry picked from commit 4d5306d047674676fe8f4e788cac88def055841a)

15 years agos3/WHATSNEW: Add reference to Franky.
Karolin Seeger [Wed, 15 Apr 2009 07:27:02 +0000 (09:27 +0200)]
s3/WHATSNEW: Add reference to Franky.

Karolin
(cherry picked from commit 0df89b9a991adf692b26f2c5e50d0ed90e244849)

15 years agos3-spoolss: Fix format of description string in spoolss_PrinterInfo1.
Günther Deschner [Tue, 14 Apr 2009 21:19:25 +0000 (23:19 +0200)]
s3-spoolss: Fix format of description string in spoolss_PrinterInfo1.

This is what windows does and should get us closer to show the appropriate
printer location string in explorer.

Guenther
(cherry picked from commit 4721be488ceb8229d564e4b63ca9937603394e51)
(cherry picked from commit 90643d5d5457959cf18a4b99f6ecb1bb88886fe0)

15 years agonetdomjoin-gui: make sure to grey out change fields when not running as root.
Günther Deschner [Tue, 14 Apr 2009 20:39:36 +0000 (22:39 +0200)]
netdomjoin-gui: make sure to grey out change fields when not running as root.

Guenther
(cherry picked from commit ca3de0103b545c86c8507dfc7d042f1838d5dfb2)
(cherry picked from commit cb96e70a1d9112d9e4fff1fda4cf64abc7985347)

15 years agolibwbclient: Fix undocumented arguments doxygen warnings.
Günther Deschner [Tue, 14 Apr 2009 14:27:05 +0000 (16:27 +0200)]
libwbclient: Fix undocumented arguments doxygen warnings.

Guenther
(cherry picked from commit f2b3fbf0c04a6f9484853da263174a472eb6bb6d)

15 years agos3-nsswitch: fix make test_wbpad.
Günther Deschner [Tue, 14 Apr 2009 12:55:24 +0000 (14:55 +0200)]
s3-nsswitch: fix make test_wbpad.

Guenther
(cherry picked from commit 1b9384a11f2957bcfbe9f23e023c79535d4a7bc9)
(cherry picked from commit e7c9c2f279eaa424ba7cfecd0bfd827520640f5d)

15 years agosocket_wrapper: fix the build on systems without ipv6 support
Stefan Metzmacher [Tue, 14 Apr 2009 10:45:48 +0000 (12:45 +0200)]
socket_wrapper: fix the build on systems without ipv6 support

metze
(cherry picked from commit 74707e8e8e1be2cbaa71fb0442957be2e663cbde)
(cherry picked from commit b5faa34596eed3ada7f45db991ef0beb0391ce82)

15 years agos4-smbtorture: make sure samba3 does not regress in EnumServicesStatusW call.
Günther Deschner [Tue, 14 Apr 2009 10:10:22 +0000 (12:10 +0200)]
s4-smbtorture: make sure samba3 does not regress in EnumServicesStatusW call.

Guenther
(cherry picked from commit a2ef1fee69771f58c27604ef213405031f42ff96)
(cherry picked from commit 3368cd38f710b9d21a3382bfd8971f0f6517eec1)

15 years agos3-svcctl: fix memcpy in _svcctl_EnumServicesStatusW().
Günther Deschner [Tue, 14 Apr 2009 10:08:55 +0000 (12:08 +0200)]
s3-svcctl: fix memcpy in _svcctl_EnumServicesStatusW().

Make sure we are not copying more than what we have as valid data.

Fix from Jeremy. Thanks a lot for watching this so closely!

Guenther
(cherry picked from commit fa302020ee39bf39bf324983cf8e381232691e76)
(cherry picked from commit 5fc2656e600791667835775c94a86f788abbcc1a)

15 years agos3-spoolss: remove unused dup_nt_devicemode().
Günther Deschner [Tue, 14 Apr 2009 10:00:39 +0000 (12:00 +0200)]
s3-spoolss: remove unused dup_nt_devicemode().

Guenther
(cherry picked from commit e3ceb0c65333cb870463971021e3af24d82abf26)
(cherry picked from commit 0f48d27d6fb45bc61899916037a5133e3022ec59)

15 years agos4-smbtorture: print SPOOLSS_JOB_CONTROL flags in RPC-SPOOLSS test.
Günther Deschner [Mon, 13 Apr 2009 23:08:23 +0000 (01:08 +0200)]
s4-smbtorture: print SPOOLSS_JOB_CONTROL flags in RPC-SPOOLSS test.

Guenther
(cherry picked from commit 4a2dfbf3c94c8fc4c2cbcbea3b138c5a9674f951)
(cherry picked from commit f78af6c1f1bab5299ef286ada2477e849cf5ba97)

15 years agos3-rpcclient: add set_job command.
Günther Deschner [Mon, 13 Apr 2009 21:11:23 +0000 (23:11 +0200)]
s3-rpcclient: add set_job command.

Guenther
(cherry picked from commit fc056e561b95fb7869053bdec810e8c47e6c6dc2)
(cherry picked from commit d99b3025eb54030e90d0c32b2967490d41a1e02a)

15 years agos4-smbtorture: fix two valgrind warnings.
Günther Deschner [Mon, 13 Apr 2009 18:44:19 +0000 (20:44 +0200)]
s4-smbtorture: fix two valgrind warnings.

Guenther
(cherry picked from commit 1dbb6530fa044fbbc65409238b5b57dfd0e850a3)
(cherry picked from commit 4a12f9e09355236fc2d50651177197fc68b075e0)

15 years agos4-smbtorture: disable test_SecondaryClosePrinter when running against s3 for now.
Günther Deschner [Mon, 13 Apr 2009 15:06:37 +0000 (17:06 +0200)]
s4-smbtorture: disable test_SecondaryClosePrinter when running against s3 for now.

Guenther
(cherry picked from commit 56f5105400e1eda7baf5babe7ad1e608d0ffa04b)
(cherry picked from commit 677b57deeb96e3e4c2b604abca29b6a49471fc01)

15 years agos4-smbtorture: move test_ReplyOpenPrinter from RPC-SPOOLSS to RPC-SPOOLSS-NOTIFY.
Günther Deschner [Mon, 13 Apr 2009 15:05:12 +0000 (17:05 +0200)]
s4-smbtorture: move test_ReplyOpenPrinter from RPC-SPOOLSS to RPC-SPOOLSS-NOTIFY.

Guenther
(cherry picked from commit 0f76e2d0bd8120d27ec6b782da6fb63407012fa2)
(cherry picked from commit 03b5a3dd11c7e7300acf1c07d25c4374802d4fc5)

15 years agos3-spoolss: fix typo in fill_printer_driver_info3().
Günther Deschner [Mon, 13 Apr 2009 21:40:46 +0000 (23:40 +0200)]
s3-spoolss: fix typo in fill_printer_driver_info3().

Guenther
(cherry picked from commit a79e1ce0488f80f40ddb4c9b32a7be4d5e1cb9d4)
(cherry picked from commit 8f08c873a69c8a9a210ba0c1943a2f053c22b225)

15 years agos3-loadparm: Fix resume command typo for "printing = vlp".
Günther Deschner [Mon, 13 Apr 2009 15:03:46 +0000 (17:03 +0200)]
s3-loadparm: Fix resume command typo for "printing = vlp".

Guenther
(cherry picked from commit e1a76de03aecb2e5e554c0594664a846efbbe65a)
(cherry picked from commit 5fd2ea50e390c1d9ecee7e8473f94f8e0c366650)

15 years agos3-spoolss: Fix permission checks for _spoolss_AddForm,SetForm and DelForm.
Günther Deschner [Mon, 13 Apr 2009 13:20:47 +0000 (15:20 +0200)]
s3-spoolss: Fix permission checks for _spoolss_AddForm,SetForm and DelForm.

Found by smbtorture test.

Guenther
(cherry picked from commit 3ef0b8671ddf246e32b479443ce97851a671a1a8)
(cherry picked from commit ed058b0cdace655b3080a06a7b2a7c717c4e21c1)

15 years agos3: re-run make samba3-idl.
Günther Deschner [Mon, 13 Apr 2009 14:02:02 +0000 (16:02 +0200)]
s3: re-run make samba3-idl.

Guenther
(cherry picked from commit baeee974495d1be18c61f74ce49a93cd02eac538)
(cherry picked from commit d9a6162532129f28514b186dfddb502e958d2031)

15 years agospoolss: add spoolss_DriverAttributes bitmask.
Günther Deschner [Mon, 13 Apr 2009 14:01:30 +0000 (16:01 +0200)]
spoolss: add spoolss_DriverAttributes bitmask.

Guenther
(cherry picked from commit 63b22a74f69cbc5035e8875d656041b5da975f66)
(cherry picked from commit 8cf32e47823c624ed591eabd34531e2037e2e149)

15 years agos3-spoolss: use enumprinterdrivers_level() for level 3 enum.
Günther Deschner [Mon, 13 Apr 2009 13:42:32 +0000 (15:42 +0200)]
s3-spoolss: use enumprinterdrivers_level() for level 3 enum.

Guenther
(cherry picked from commit 97ffd709f85ca0ecd101aac614fea19151394677)
(cherry picked from commit 2b3eff6261767b9994b9efeee6c0c8dfc174b322)

15 years agos3-spoolss: use enumprinterdrivers_level() for level 2 enum.
Günther Deschner [Mon, 13 Apr 2009 13:40:39 +0000 (15:40 +0200)]
s3-spoolss: use enumprinterdrivers_level() for level 2 enum.

Guenther
(cherry picked from commit 9b3d3e8aebac25c55b2bcfb3daf3ba3d7df9d280)
(cherry picked from commit d264f7d1fd9020cd85e1ae822974e87c25eff759)

15 years agos3-spoolss: use enumprinterdrivers_level() for level 1 enum.
Günther Deschner [Mon, 13 Apr 2009 13:31:52 +0000 (15:31 +0200)]
s3-spoolss: use enumprinterdrivers_level() for level 1 enum.

Guenther
(cherry picked from commit f325c342031d11d6133d417bdf57d918f4f10981)
(cherry picked from commit 8e15179c5c8e30548727cbc07c8292e97600eacf)

15 years agos3-spoolss: add generic enumprinterdrivers_level function.
Günther Deschner [Mon, 13 Apr 2009 13:27:55 +0000 (15:27 +0200)]
s3-spoolss: add generic enumprinterdrivers_level function.

Guenther
(cherry picked from commit 0393c99302dc12f18f06db83201f096624682ea2)
(cherry picked from commit 227ebae3ce2ddf3f65f3aeb446352912f1d3f906)

15 years agos4-smbtorture: use printerinfo level 1 name, not description in
Günther Deschner [Mon, 13 Apr 2009 12:48:32 +0000 (14:48 +0200)]
s4-smbtorture: use printerinfo level 1 name, not description in
test_EnumPrinters_old().

Guenther
(cherry picked from commit 81aca44d30783d1c162498a257fc47cc44a649fb)
(cherry picked from commit 9948d33049864436bb2bb9b444822458c19156c8)

15 years agos3: re-run make samba3-idl.
Günther Deschner [Mon, 13 Apr 2009 12:16:04 +0000 (14:16 +0200)]
s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 609e401b976a99ad82e37c2c3617684c8bb3e6c4)
(cherry picked from commit 9f6d54aba0d3d0e0730c17d414a5231b8a46ede7)

15 years agospoolss: fix order of strings in PrinterInfo1 structs.
Günther Deschner [Mon, 13 Apr 2009 12:15:21 +0000 (14:15 +0200)]
spoolss: fix order of strings in PrinterInfo1 structs.

Guenther
(cherry picked from commit 3918ee88701942c35dc8ed957d507076ead8d3f5)
(cherry picked from commit 8303246b3025e6dbda3c8f7e49ae394fd676323f)

15 years agoFix a bug in smbclient not sending the correct called name
Volker Lendecke [Sun, 12 Apr 2009 10:52:42 +0000 (12:52 +0200)]
Fix a bug in smbclient not sending the correct called name

Jeremy, I think the ability to say

smbclient //foo/bar -I <ip-address> -p 139

making the called name to "foo" got lost with 3d2d0203. Was this removed
deliberately? If so, please revert this patch. If not, please merge
appropriately.

Thanks,

Volker
(cherry picked from commit f13763ca4be49c08dfc533e39dd338b508ba4709)

15 years agoWe have to deny a level 2 oplock if kernel oplocks are enabled
Volker Lendecke [Wed, 8 Apr 2009 06:29:23 +0000 (08:29 +0200)]
We have to deny a level 2 oplock if kernel oplocks are enabled

The second r/o opener of a file is supposed to get a level2 oplock. The first
opener due to the protection in process_oplock_break_message() has been forced
to break to no oplock. The second opener according to locking.tdb gets a level2
oplock. Further down in open_file_ntcreate we try to set this level2 oplock in
the kernel, and the non-clustered Linux kernel disallows this. The rules for
the kernel leases are a bit baroque, but the attempt to do the SETLEASE
correctly fails and we end up with no oplock for any client.

In the clustered case however the linux kernel on the second opening node has
not seen the open fd of the first node, it is only the cluster fs that has this
information. If the cluster fs does not have the very same notion of leases as
the local kernel has, we can end up with a WRLCK style kernel lease for the
second opener where locking.tdb only indicates a level2 oplock. Getting a
kernel oplock break signal with just a level2 oplock in locking.tdb is
something smbd is not prepared for. For example after sending out the break in
response to the kernel signal we set a timeout, waiting for a reply.

More work needs to be done to make level2 kernel oplocks real for us. This
patch addresses a real problem we have right now without them.
(cherry picked from commit 17962ba589f24b7d2a67474978d06e33adad56c2)

15 years agoFix a memleak in an unlikely error path in change_notify_create()
Volker Lendecke [Thu, 9 Apr 2009 09:40:08 +0000 (11:40 +0200)]
Fix a memleak in an unlikely error path in change_notify_create()
(cherry picked from commit fb8707e2c2d1657294b0660064e1b16590d1ca6c)

15 years agosocket_wrapper: fix crash bug in swrap_readv/writev
Stefan Metzmacher [Wed, 8 Apr 2009 17:08:34 +0000 (19:08 +0200)]
socket_wrapper: fix crash bug in swrap_readv/writev

metze
(cherry picked from commit f20f5ae8e6b9ca5c90441a3083f6904168388fdf)
(cherry picked from commit 44576254f8c0d35327cfe8f9928f0efc987b5822)

15 years agos3-spoolss: implement dummy _spoolss_AddPort().
Günther Deschner [Fri, 10 Apr 2009 01:28:49 +0000 (03:28 +0200)]
s3-spoolss: implement dummy _spoolss_AddPort().

Guenther
(cherry picked from commit bc5cd077643bc73d93fa73970761f8d1708d14a9)
(cherry picked from commit 4a4047c3b08412cfdd8c03b1994a925e10fc4c4a)

15 years agos3-spoolss: add support for level 8 in _spoolss_GetPrinter().
Günther Deschner [Fri, 10 Apr 2009 01:28:17 +0000 (03:28 +0200)]
s3-spoolss: add support for level 8 in _spoolss_GetPrinter().

Guenther
(cherry picked from commit 65ee4ae30b952841e97f54c5eaa4d43ca66a02c1)
(cherry picked from commit 55fc8bb906293b5d2a2ae0a6e64bdc7ef046b230)

15 years agos3-eventlog: implement _eventlog_FlushEventLog().
Günther Deschner [Wed, 8 Apr 2009 16:32:06 +0000 (18:32 +0200)]
s3-eventlog: implement _eventlog_FlushEventLog().

Guenther
(cherry picked from commit bcd042e595d63eae8cfc9e9d51e9567a4f9ccc63)
(cherry picked from commit e6ff89bf11c14736863057e4b4db7ec9c3c71856)

15 years agos3-eventlog: implement _eventlog_GetLogInformation().
Günther Deschner [Wed, 8 Apr 2009 16:31:32 +0000 (18:31 +0200)]
s3-eventlog: implement _eventlog_GetLogInformation().

Guenther
(cherry picked from commit 9b585a1282a9211ae101072361aead86d123045e)
(cherry picked from commit 9beaaddb4be46960576306b055f1cbbb05d4dae7)

15 years agos3: re-run make samba3-idl.
Günther Deschner [Wed, 8 Apr 2009 18:34:24 +0000 (20:34 +0200)]
s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 2b0293d42b3daecbe41c760a1ea41235d24105d3)
(cherry picked from commit f017b26f35ffeb8796f2ee97e5c29b896da1e7ac)

15 years agoeventlog: make EVENTLOG_FULL_INFORMATION a public struct.
Günther Deschner [Wed, 8 Apr 2009 18:33:58 +0000 (20:33 +0200)]
eventlog: make EVENTLOG_FULL_INFORMATION a public struct.

Guenther
(cherry picked from commit 7f74f27d6c60d46b51372a2d5c289788038daeb5)
(cherry picked from commit 895945637c7cbcf70695cb8fbabf364ebff85548)

15 years agoFix bug #6254 - PUT/GET produces an error in IPv6 to a smb-server(3.3) has parameter...
Jeremy Allison [Fri, 10 Apr 2009 05:44:56 +0000 (22:44 -0700)]
Fix bug #6254 - PUT/GET produces an error in IPv6 to a smb-server(3.3) has parameter "msdfs root = yes"
This was broken by the refactoring around create_file().
MSDFS pathname processing must be done FIRST.
MSDFS pathnames containing IPv6 addresses can
be confused with NTFS stream names (they contain
":" characters.
Jeremy.
(cherry picked from commit b8251a7e01304afce96cb0bee15a1fee2bd57490)

15 years agos3-selftest: enable the RPC-NTSVCS torture test against Samba3.
Günther Deschner [Thu, 9 Apr 2009 22:44:36 +0000 (00:44 +0200)]
s3-selftest: enable the RPC-NTSVCS torture test against Samba3.

Guenther
(cherry picked from commit f930f504e1d5e78d2f6f36cab9ce36dbeb34e955)
(cherry picked from commit cd4c88dbe6a292d9244165748b9121eae30d93d0)

15 years agos3-ntsvcs: fix _PNP_GetDeviceList and _PNP_GetDeviceListSize.
Günther Deschner [Thu, 9 Apr 2009 22:43:55 +0000 (00:43 +0200)]
s3-ntsvcs: fix _PNP_GetDeviceList and _PNP_GetDeviceListSize.

Guenther
(cherry picked from commit b7caf138518028507809bd6d356ec53b1564f0a1)
(cherry picked from commit 0d64245da273bb4452e29bdd01e059ea91625559)

15 years agos4-smbtorture: perform the ntsvcs devicelist tests against the Spooler service.
Günther Deschner [Thu, 9 Apr 2009 22:42:35 +0000 (00:42 +0200)]
s4-smbtorture: perform the ntsvcs devicelist tests against the Spooler service.

Guenther
(cherry picked from commit c0b71db8e155c1d5e09b5be23ea681fd90955ac7)
(cherry picked from commit b2d3a08c8f9f091fb3f9576d892ec2c80bb64a62)

15 years agos3-rpcclient: allow to set flags in cmd_ntsvcs_get_dev_list().
Günther Deschner [Thu, 9 Apr 2009 22:00:44 +0000 (00:00 +0200)]
s3-rpcclient: allow to set flags in cmd_ntsvcs_get_dev_list().

Guenther
(cherry picked from commit ade9ef19835b6464eeddd351a165eb4b9bf2366c)
(cherry picked from commit 0f2314f2fc8d78736c009bf6ecab3247e1720672)

15 years agoerror-codes: add WERR_CM_INVALID_POINTER.
Günther Deschner [Thu, 9 Apr 2009 21:44:24 +0000 (23:44 +0200)]
error-codes: add WERR_CM_INVALID_POINTER.

Guenther
(cherry picked from commit 43eb50655e71e5f407ffbd7069cc2d45a3b478b6)
(cherry picked from commit 21eee66cd83db85701aafa4db898f85e1d941ec8)

15 years agos3: re-run make samba3-idl.
Günther Deschner [Thu, 9 Apr 2009 22:01:41 +0000 (00:01 +0200)]
s3: re-run make samba3-idl.

Guenther
(cherry picked from commit e4b4a07357920756f5bf0ca991ec8f4b38dc7968)
(cherry picked from commit 59638bc290681e4d8bc11faa4cc36b70242b314f)

15 years agontsvcs: add PNP_GetIdListFlags flags.
Günther Deschner [Thu, 9 Apr 2009 15:53:36 +0000 (17:53 +0200)]
ntsvcs: add PNP_GetIdListFlags flags.

Guenther
(cherry picked from commit 7065b2b2ad604a3faf8df0e123e04ed7f532afda)
(cherry picked from commit 4c1a5133ab73552fe1be80a50da1c44875e93340)

15 years agos3-svcctl: minor fix for _svcctl_EnumDependentServicesW().
Günther Deschner [Thu, 9 Apr 2009 13:39:45 +0000 (15:39 +0200)]
s3-svcctl: minor fix for _svcctl_EnumDependentServicesW().

Guenther
(cherry picked from commit 76da89daaadc358c836817cf597a1ff1489a9029)
(cherry picked from commit fa1ca9ab110d43e1c56c8d28d8143c79891ff8a0)

15 years agos4-smbtorture: add test_EnumDependentServicesW() to RPC-SVCCTL.
Günther Deschner [Thu, 9 Apr 2009 13:30:18 +0000 (15:30 +0200)]
s4-smbtorture: add test_EnumDependentServicesW() to RPC-SVCCTL.

Guenther
(cherry picked from commit 693c2e95294909292cd28982983681ea24912d28)
(cherry picked from commit 09397f1889db4957218d780117b6ce312f03e638)

15 years agos3: re-run make samba3-idl.
Günther Deschner [Thu, 9 Apr 2009 14:41:32 +0000 (16:41 +0200)]
s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 2d211450420ee4848d3c5ad73ce9d529a267c13a)
(cherry picked from commit f1e3ae21d3d7a5f05b6306c25a5f0084ff549400)

15 years agosvcctl: use svcctl_ServiceState type for dependent calls in IDL.
Günther Deschner [Thu, 9 Apr 2009 14:40:13 +0000 (16:40 +0200)]
svcctl: use svcctl_ServiceState type for dependent calls in IDL.

Guenther
(cherry picked from commit af32ab94eb5cb954328174f6809ff3c856d3ef6e)
(cherry picked from commit 6fd320aa148a81fba79fcab4996cabc7d07224b2)