[SCM] Samba Shared Repository - branch v3-4-stable updated - release-4-0-0alpha7-825-g5c89bbd

Karolin Seeger kseeger at samba.org
Wed Apr 29 06:18:07 GMT 2009


The branch, v3-4-stable has been updated
       via  5c89bbd6b53d4a3ab7b84f906ecc7ad8a95b3183 (commit)
       via  ea99b6854632c66bef81500e4d6c388351802d48 (commit)
       via  bec6191ffa9ed1d860001689b8f46bd785ed932b (commit)
       via  035f4efa9943e4b9cb3ecbc239e3fa579a5cfdd2 (commit)
       via  9af9a660b376e09a800719861d7379ed75507705 (commit)
       via  7bc900deed605ec1afa9804df222f282f79b42bb (commit)
       via  7e30a445b840bfa0ceb47f4c03812744ee69e78a (commit)
       via  8d6692a2d7cce1ebddc8b69a315c847ac6668d6f (commit)
       via  2bf4ec443a1fafab6507a81b2597ad3160f61ca1 (commit)
       via  b7305e3955e8be75fffa1f9bde2f56259464270d (commit)
       via  ac408e406812f7e50372a2819d13c64f936d5c91 (commit)
       via  cbef68847e7eef7d44bf24c7c4a460e715c67ff1 (commit)
       via  6045bbc6dbc4437826a7f0f6661215e95773206d (commit)
       via  e5f46c2e032f0c043483ff13b6296a207a89bfa3 (commit)
       via  c78cddd72296a1e3230bab03b6843672aa10e22b (commit)
       via  7372ce3715157a9efbd7ca1550cbc8850ce48305 (commit)
       via  09125185cd0b23c678de9c039e08424f43e7a596 (commit)
       via  bcd4aafacf01a54ffab6501656c09e76f67264e7 (commit)
       via  76b850f3be7ef66cd911f65e91cfa565828ddb9b (commit)
       via  84dbdb56a5e90bef55a9b30722da5f13e2ceb534 (commit)
       via  030f9b5c7fd6bfc4cfd791b3b8fc573e39a89dcd (commit)
       via  cb48d313e097af81600dfc8fda5ee71bc47aa2c7 (commit)
       via  de195ef0717ed7b724a12d69acfd841e268bcaa9 (commit)
       via  3384209e617a9a4806ae2b984600578930228bae (commit)
       via  4c716b59adfc68ee36ea12f08cc41cf3be2ec542 (commit)
       via  fe02a9842dacecb0532e4c419789dc82ed053661 (commit)
       via  01b1eff630bb07553a2eadb82df5246b3f70b3b7 (commit)
       via  799716eacaaf96eb71f4bf3628d2c1c983ae7f1e (commit)
       via  e92e7afaf765257ce9fb26940d6df1102439873a (commit)
       via  2f97df10048314763c44ee701dff5654981159bd (commit)
       via  6bc7610fe57bd8430d5f2fc62791cfc313f6596d (commit)
       via  3cda976563a1ec5b1f9d02d6f7187cd579246b5b (commit)
       via  70e0f5a5f625ff63e76152663f1cc8f71430e3dc (commit)
       via  25557ed661cd29ab5e237d8f9789bf84adcf35a0 (commit)
       via  8eb8219bcd0a03a4f9300a2d79a428f95b0f2a4f (commit)
       via  07fdba31c1c125c441044f257ecc3b7b91b4b7f4 (commit)
       via  87d9bc7653c612f7739a9ade7f1698071687c048 (commit)
       via  ce42bf82955ca4cf5995b09afecb85cbca56eedd (commit)
       via  4a7791c10200857c58772ee44866e58c3c96e0f5 (commit)
       via  d4de0514d687ec1369e3072f9c9fe84c46cb9258 (commit)
       via  39efa93479c724cce8a339e46238b560d9003f10 (commit)
       via  e64e99f210c4bdbc6fba2039dd78751bb76a3673 (commit)
       via  fe2e574b60840e8f8710fa7ac3b27c82b10785db (commit)
       via  83d81d9a9d3ecd4d0f0516c7c3fec8000b0ddd01 (commit)
       via  34c45b1bd54cad2389d4eae920bdf2d4c4e15fb0 (commit)
       via  01204bf445aa982ad2716cbe90980bc5c31556f6 (commit)
       via  343ff932ab3f98c8ec1c57109c54fdcf17630de4 (commit)
       via  38223c681c0574b92604afbac2e4134b1bb4969e (commit)
       via  8f980f4f73bcf54ade3008a13b0e8d6a1980e52b (commit)
       via  e3bb5ed7641081f14d828f459e43e64fbaa0d9c4 (commit)
       via  675e2e81f51f65566bdeedf53cf1e060f3fe606b (commit)
       via  137cff8b597950dd7b7e75c3ae5f08583a1eb544 (commit)
       via  0772ce864713a343c36b532597ec5078f7c55890 (commit)
       via  0f7eb7b95d4a72b02312a33970775be575580fb0 (commit)
       via  55351d1a2d32737783c66ba2f767423de360277e (commit)
       via  0b0737d6516a42bf4c4a48a633a504bf9dd39bb7 (commit)
       via  801fc31d363c1ab9f016bbe2dc8e0bbebbabcbd3 (commit)
       via  8839c4fd40d44b825996f4cee68d4d43f1097973 (commit)
       via  e61e8f4c785248512c71f8e0a2002627037cb879 (commit)
       via  7ed136453a7a46e99cb7af5c9c4dc4b82feb6a45 (commit)
       via  311ba6b1a67d448bc58c7f3db7d0180a1e83aa46 (commit)
       via  40c07e69252a3ce80533ff1d82841ed9fec49df9 (commit)
       via  dfa1d2b5cea954a36fe1c9d323db76e51d35f376 (commit)
       via  1bc31651748bb785d08f8d92df4d8439e42f383f (commit)
       via  c61db17779388cb3b11db1d030e251b393462309 (commit)
       via  c9dfce75b2dbd13e9c8aa140c51803b7f3ca6a49 (commit)
      from  afcc2d0962a6f2a867d9022b30635707af3bafce (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable


- Log -----------------------------------------------------------------
commit 5c89bbd6b53d4a3ab7b84f906ecc7ad8a95b3183
Author: Michael Adam <obnox at samba.org>
Date:   Tue Apr 28 12:18:23 2009 +0200

    pm_process():raise level of debug message
    
    Michael
    (cherry picked from commit 664da577f931dfd47573d3d77a95afb573fba855)
    (cherry picked from commit caa1f05420191d934c2ea1c2acaa75702c8e5c2e)

commit ea99b6854632c66bef81500e4d6c388351802d48
Author: Michael Adam <obnox at samba.org>
Date:   Mon Apr 27 18:10:14 2009 +0200

    s3:loadparm: prevent infinite include nesting.
    
    This introduces a hard coded MAX_INCLUDE_DEPTH of 100.
    When this is exceeded, handle_include (and hence lp_load) fails.
    
    One could of course implement a more intelligent loop detection
    in the include-tree, but this would require some restructuring
    of the internal loadparm housekeeping. Maybe as a second improvement
    step.
    
    Michael
    (cherry picked from commit d5f2bbdc489b751331e86afae58b0d80c5fedb9c)
    (cherry picked from commit bfd10fd322fe1721b8b45256cd988ed83b18a8a6)

commit bec6191ffa9ed1d860001689b8f46bd785ed932b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 27 14:39:02 2009 +0200

    s3-net: make sure to call libnetapi init functions at the top of "net rpc" command.
    
    Without the initialization "net rpc password" will prompt twice for passwords
    and will not allow to define the name of the connection admin user.
    
    In the long run we should probably only have one place where to initialize
    libnetapi.
    
    Kai, please check.
    
    Guenther
    (cherry picked from commit 09ec85715b0e99740156ebb7213eddd1edfea631)
    (cherry picked from commit 0c5f19fbea7a6419a84ac0137a9a09995ef7a933)

commit 035f4efa9943e4b9cb3ecbc239e3fa579a5cfdd2
Author: Michael Adam <obnox at samba.org>
Date:   Tue Apr 28 01:24:27 2009 +0200

    s3:mark registry shares without path unavailable just as with text config
    
    This prevents users from getting access to "/" in misconfigured setups.
    
    Michael
    (cherry picked from commit d16e40b5ef9add630d027ff92e440c44bfb88ef0)
    (cherry picked from commit 3bdb4342225444055b084908083e003e0e272e10)

commit 9af9a660b376e09a800719861d7379ed75507705
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Apr 28 11:16:19 2009 +0200

    Fix annoying debug messages when no snapshots are used
    
    Not being able to open the shadow copy directory is the same as having no
    shadow copy support at all. The VFS module should in this case not log with
    debug level 0 and set ENOSYS to indicate "no shadow copies used" to the higher
    levels.
    (cherry picked from commit 4982483cdd2a4d37f96574c19dd3aade236c1b93)

commit 7bc900deed605ec1afa9804df222f282f79b42bb
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 28 01:08:31 2009 +0200

    s3-svcctl: Fix crash in _svcctl_EnumServicesStatusW().
    
    The resume handle is a unique pointer, always check before dereference.
    
    Guenther
    (cherry picked from commit dd33abf649f4e1479365a2ccc2b41134270ff4ac)
    (cherry picked from commit 1e117c6ebc6322b7fac4928d84bc5e714e559ea5)

commit 7e30a445b840bfa0ceb47f4c03812744ee69e78a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 21 16:18:51 2009 +0200

    s3-svcctl: indicate that the spooler is already running if it does.
    
    Guenther
    (cherry picked from commit 16b2f4b55a80314aa733dd7f23543c1c3926223c)
    (cherry picked from commit 265e1fca1228776a0a7556ef854bfcc4130085b4)

commit 8d6692a2d7cce1ebddc8b69a315c847ac6668d6f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 10 21:39:45 2009 +0200

    s3-svcctl: fix _svcctl_ControlService.
    
    Guenther
    (cherry picked from commit aa26bdd71969610a4b6a5bdfdd735a1dab31a12c)
    (cherry picked from commit 32e4e65e61e627100a8201b5aba273c2e8b63de8)

commit 2bf4ec443a1fafab6507a81b2597ad3160f61ca1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 10 21:10:07 2009 +0200

    s4-smbtorture: add test_ControlService() to RPC-SVCCTL.
    
    Guenther
    (cherry picked from commit a263eaca499cf2b8a89c3ab04c6ef5e7e9aea396)
    (cherry picked from commit d9d4e769a4d4a2978656ef77e9e91308152a9483)

commit b7305e3955e8be75fffa1f9bde2f56259464270d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 10 20:55:10 2009 +0200

    s4-smbtorture: add test_StartServiceW() to RPC-SVCCTL.
    
    Guenther
    (cherry picked from commit f926a4e390e7108dad36ecfffaddb628b23436c0)
    (cherry picked from commit 16f3e855d056e5951fa6136a61c13d09fa9a74c1)

commit ac408e406812f7e50372a2819d13c64f936d5c91
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 20 16:49:01 2009 +0200

    s4-smbtorture: change default service to spooler in RPC-SVCCTL.
    
    Guenther
    (cherry picked from commit ae5dd1219a14e939cb1e3674e6daba7885cc9d51)
    (cherry picked from commit f783489d73d044433b911c673acca0aaf0fb70c8)

commit cbef68847e7eef7d44bf24c7c4a460e715c67ff1
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Mar 28 01:21:25 2009 +0100

    Ñ•3/configure: fix regexp for ld version recognition
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    (cherry picked from commit 740c2c4366badc62d017881c9484ee5153b62f94)
    (cherry picked from commit 172ecfae44768289b98c1bafa7aa2b89dbecc312)

commit 6045bbc6dbc4437826a7f0f6661215e95773206d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 24 10:02:06 2009 +0200

    s3-idmap: Fix bug #6286: Call init function for builtin idmap modules before probing for them as shared modules.
    
    idmap-gurus of the world, please check.
    
    Guenther
    (cherry picked from commit 67588ca80d654183b8b7b062b9660a506a825f94)
    (cherry picked from commit 76e2e56e256695c1d52bd67d1b07bce0c7e0f37c)

commit e5f46c2e032f0c043483ff13b6296a207a89bfa3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 23 14:56:55 2009 +0200

    Revert "Do not use the file system GET_REAL_FILENAME for mangled names"
    
    This reverts commit c8cc6da0ab4441ce7b22cf00eed05290e91530c4.
    (cherry picked from commit c7d5e046d8fa4097fc16a3dee10e95b83a8c8e55)

commit c78cddd72296a1e3230bab03b6843672aa10e22b
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 23 02:51:55 2009 -0700

    Fix coverity #901 - uninitialized data.
    Jeremy.
    (cherry picked from commit aa09344a77a686466371725e6f1c3f2ebaca684a)

commit 7372ce3715157a9efbd7ca1550cbc8850ce48305
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 23 11:05:49 2009 +0200

    Fix Coverity ID 626: DEADCODE
    (cherry picked from commit eb247d6eb727b451727f454b0ec207f255341671)

commit 09125185cd0b23c678de9c039e08424f43e7a596
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 23 10:49:41 2009 +0200

    Fix Coverity ID 628, Andrew B., please check!
    (cherry picked from commit d8703a064e70bd56b2f0ddcde73af14045deed8c)

commit bcd4aafacf01a54ffab6501656c09e76f67264e7
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 23 01:47:04 2009 -0700

    Fix coverity #908, #909, uninitialized variable.
    Jeremy.
    (cherry picked from commit 7f8e21ad459dbe5fdd20d3040d017787198de21d)

commit 76b850f3be7ef66cd911f65e91cfa565828ddb9b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 23 10:42:43 2009 +0200

    Fix Coverity ID 884: DEADCODE
    (cherry picked from commit cb8c7f2291897cc6d9bffdb48f4baca80161c2f8)

commit 84dbdb56a5e90bef55a9b30722da5f13e2ceb534
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 23 01:38:21 2009 -0700

    Fix coverity #910, uninitialized variable.
    Jeremy.
    (cherry picked from commit 7310c258a07f9f9da0ba736919f9021ab8125f66)

commit 030f9b5c7fd6bfc4cfd791b3b8fc573e39a89dcd
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 22 23:48:24 2009 +0200

    s3-selftest: test wbinfo --allocate-uid/gid.
    
    Guenther
    (cherry picked from commit 59fe99027d0ac972d0d74a24842d6423119c0d21)
    (cherry picked from commit abac431ce164c3ce3fcf53fbc77d0486347e22f1)

commit cb48d313e097af81600dfc8fda5ee71bc47aa2c7
Author: Simo Sorce <ssorce at redhat.com>
Date:   Wed Apr 22 09:12:58 2009 -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)

commit de195ef0717ed7b724a12d69acfd841e268bcaa9
Author: Simo Sorce <ssorce at redhat.com>
Date:   Wed Apr 22 06:15:21 2009 -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)

commit 3384209e617a9a4806ae2b984600578930228bae
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 03:03:04 2009 -0700

    Add comment explaining the previous fix.
    Jeremy.
    (cherry picked from commit 0b0bb2c7eb44b403e6fd50cf480ed8b2fb24a7d5)

commit 4c716b59adfc68ee36ea12f08cc41cf3be2ec542
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 02:54:11 2009 -0700

    Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
    Jeremy
    (cherry picked from commit 9ebc15bed8c05d0729066d97d3bfaade9fcbacb7)

commit fe02a9842dacecb0532e4c419789dc82ed053661
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 21 13:01:29 2009 +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)

commit 01b1eff630bb07553a2eadb82df5246b3f70b3b7
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 01:30:12 2009 +0200

    s3-secdesc: move all winreg access bits to IDL.
    
    Guenther
    (cherry picked from commit 38264bb3b86a3c9da941070f29ec08227c471d2b)
    (cherry picked from commit 904bc5011fc7df40111f493ff28972640b95c0d1)

commit 799716eacaaf96eb71f4bf3628d2c1c983ae7f1e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 01:19:30 2009 +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)

commit e92e7afaf765257ce9fb26940d6df1102439873a
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 01:16:41 2009 +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)

commit 2f97df10048314763c44ee701dff5654981159bd
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 01:12:13 2009 +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)

commit 6bc7610fe57bd8430d5f2fc62791cfc313f6596d
Author: John H Terpstra <jht at dv1000.dyn.terpstra-world.org>
Date:   Mon Apr 20 10:10:20 2009 -0500

    Added ability to revert to old modules for make revert.
    (cherry picked from commit e39255311a61897c53e00cc27df65790f83e132b)

commit 3cda976563a1ec5b1f9d02d6f7187cd579246b5b
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 15 13:01:09 2009 +0200

    Do not use the file system GET_REAL_FILENAME for mangled names
    (cherry picked from commit c8cc6da0ab4441ce7b22cf00eed05290e91530c4)

commit 70e0f5a5f625ff63e76152663f1cc8f71430e3dc
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 18 00:58:12 2009 +0200

    s3-printing: use ARRAY_SIZE() macro in forms functions.
    
    Guenther
    (cherry picked from commit 62480385c1e551448e40b01fff8e9dee318c29c1)
    (cherry picked from commit fea535368e4d62606b522031afc773d4963dbb91)

commit 25557ed661cd29ab5e237d8f9789bf84adcf35a0
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 20 00:57:53 2009 +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)

commit 8eb8219bcd0a03a4f9300a2d79a428f95b0f2a4f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 13 23:56:59 2009 +0200

    s4-smbtorture: test all levels in test_GetJob().
    
    Guenther
    (cherry picked from commit 5f0c9c57f53f9b0026b4f58f68442a72103c0d7d)
    (cherry picked from commit feec2a814ee09800c26ae4c1f637796737b7ad2a)

commit 07fdba31c1c125c441044f257ecc3b7b91b4b7f4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 23:18:24 2009 +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)

commit 87d9bc7653c612f7739a9ade7f1698071687c048
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 14 00:01:21 2009 +0200

    s3-selftest: enable RPC-SPOOLSS.
    
    Guenther
    (cherry picked from commit 6f90cdaf63b5b584c96b9ffc388c9e8df172db67)
    (cherry picked from commit 4677976a2081e4384b61d163d104c651e7a1f569)

commit ce42bf82955ca4cf5995b09afecb85cbca56eedd
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 17:21:19 2009 +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)

commit 4a7791c10200857c58772ee44866e58c3c96e0f5
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 17:19:38 2009 +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)

commit d4de0514d687ec1369e3072f9c9fe84c46cb9258
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 17:14:20 2009 +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)

commit 39efa93479c724cce8a339e46238b560d9003f10
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Apr 3 12:21:17 2009 +0200

    s3:docs: document the --request-timeout option of net
    
    metze
    (cherry picked from commit cdbbc81bad5d53397bf80898cf68d8867cf64cba)
    (cherry picked from commit 1d1e859c4e08fed1775a170ccff459f3a18e13ba)

commit e64e99f210c4bdbc6fba2039dd78751bb76a3673
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Mar 26 20:32:55 2009 +0100

    s3:net: add --request-timeout option
    
    metze
    (cherry picked from commit 257809558bfab3e45703cf8be76357596392a3ea)
    (cherry picked from commit e20b8706401d1a4eee0fe494825deef6ab23ab23)

commit fe2e574b60840e8f8710fa7ac3b27c82b10785db
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Mar 26 20:29:24 2009 +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)

commit 83d81d9a9d3ecd4d0f0516c7c3fec8000b0ddd01
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 17 15:53:38 2009 +0200

    s3: make installmo and uninstallmo scripts executable
    
    Michael
    (cherry picked from commit 9deb558c5a3c380c7e4964e6fd2fc1b948115078)

commit 34c45b1bd54cad2389d4eae920bdf2d4c4e15fb0
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 17 15:29:10 2009 +0200

    s3: Fix uninstallmo
    
    Michael
    (cherry picked from commit 81dca118cd94988f55a5b4c43436a97d04309b48)

commit 01204bf445aa982ad2716cbe90980bc5c31556f6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 15:13:33 2009 +0200

    s3-selftest: samba 3 also passes RPC-JOIN so enable it.
    
    Guenther
    (cherry picked from commit 4f9d3400e5aa310e8071c0bb5d62ddaed1d846ee)
    (cherry picked from commit c33e3b84a706fa429ceeea81fb17c434e8f6cb4e)

commit 343ff932ab3f98c8ec1c57109c54fdcf17630de4
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 17 11:40:17 2009 +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)

commit 38223c681c0574b92604afbac2e4134b1bb4969e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:21:20 2009 +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)

commit 8f980f4f73bcf54ade3008a13b0e8d6a1980e52b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:14:14 2009 +0200

    s3-selftest: enable RPC-SAMR-PASSWORDS-PWDLASTSET whilte testing Samba3.
    
    Guenther
    (cherry picked from commit 490f6c418d8b1280d0a3b85773a72b2047122c12)
    (cherry picked from commit 7f6094fe8238f7a146fe7c45ab31f0e2244704bd)

commit e3bb5ed7641081f14d828f459e43e64fbaa0d9c4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 11:04:44 2009 +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)

commit 675e2e81f51f65566bdeedf53cf1e060f3fe606b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 01:30:54 2009 +0200

    s3-docs: fix typo in smb.conf.5.
    
    Guenther
    (cherry picked from commit 05ea8daacabe62b6c20770a8518192c44e7eb763)
    (cherry picked from commit edf797fb614271c17bc005a661af8c8e8b913d81)

commit 137cff8b597950dd7b7e75c3ae5f08583a1eb544
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 01:30:16 2009 +0200

    s3-selftest: enable RPC-LSA-LOOKUPSIDS against samba 3.
    
    Guenther
    (cherry picked from commit deb719a62e0909d476b9817c45a32766dc9709d7)
    (cherry picked from commit cfb5e97b88aae1780b5ef14baa15d9c692d157ab)

commit 0772ce864713a343c36b532597ec5078f7c55890
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 01:28:41 2009 +0200

    s4-smbtorture: add LSA-LOOKUPSIDS to verify bug #6263.
    
    Guenther
    (cherry picked from commit c794ba71b762676c1cfe1eba40b4a254f16ad06a)
    (cherry picked from commit e9af8e25f2c65decaf1a9e3c452c1a4c38042b48)

commit 0f7eb7b95d4a72b02312a33970775be575580fb0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 17 01:26:40 2009 +0200

    s4-smbtorture: Fix crash in RPC-LSA-LOOKUP
    
    Guenther
    (cherry picked from commit b0a0d2a0ae16929efa392705c3d7823da16f4d55)
    (cherry picked from commit a0c16dbb46ef334126db771d7adb908d822eac6d)

commit 55351d1a2d32737783c66ba2f767423de360277e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 16 13:03:35 2009 +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)

commit 0b0737d6516a42bf4c4a48a633a504bf9dd39bb7
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 16 16:21:31 2009 -0700

    Add torture tester to ensure we don't regress the ulogoff bug.
    Jeremy.
    (cherry picked from commit 4ee6b7934e91b87122ff7bad4c89a0ab9bdd3bf0)

commit 801fc31d363c1ab9f016bbe2dc8e0bbebbabcbd3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 16 16:19:10 2009 -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)

commit 8839c4fd40d44b825996f4cee68d4d43f1097973
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 16 15:15:10 2009 -0700

    When doing a cli_ulogoff don't invalidate the cnum, invalidate the vuid.
    Jeremy.
    (cherry picked from commit be46b98ee38e17e4561ab58fe9b6ecc6b7919392)

commit e61e8f4c785248512c71f8e0a2002627037cb879
Author: Jim McDonough <jmcd at samba.org>
Date:   Thu Apr 16 17:14:20 2009 +0200

    Don't look up local user for remote changes, even when root.
    (cherry picked from commit 583d7c97bb5f9b62fab17ce2466442ece648331f)

commit 7ed136453a7a46e99cb7af5c9c4dc4b82feb6a45
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 16 11:13:24 2009 +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)

commit 311ba6b1a67d448bc58c7f3db7d0180a1e83aa46
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Apr 16 10:25:29 2009 +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 at meltin.net>
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e344341ddd46e45b2ecdaf604cdd5d64adab6343)

commit 40c07e69252a3ce80533ff1d82841ed9fec49df9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 16 01:42:35 2009 +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)

commit dfa1d2b5cea954a36fe1c9d323db76e51d35f376
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 15 15:40:00 2009 -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)

commit 1bc31651748bb785d08f8d92df4d8439e42f383f
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 22:47:15 2009 +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)

commit c61db17779388cb3b11db1d030e251b393462309
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 15 17:07:48 2009 +0200

    s3-examples: make sure to match correct key name in adssearch.
    
    Guenther
    (cherry picked from commit 6fe012ff78caf10f4bf5503b27030cd54563ad0b)
    (cherry picked from commit 6afb9614381f926b590c627f44cf5a93e11068ec)

commit c9dfce75b2dbd13e9c8aa140c51803b7f3ca6a49
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 14 23:30:13 2009 +0200

    s4-smbtorture: define TORTURE_DEFAULT_SERVICE and set to netlogon.
    
    Guenther
    (cherry picked from commit f1fd39c09f0e094c882775367b1e4c5772d7ee51)
    (cherry picked from commit 9c914cf1bd4ce2d7abba6a4e94e393cb930f259e)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/net.8.xml                      |    9 ++
 docs-xml/manpages-3/pam_winbind.7.xml              |    9 ++-
 .../smbdotconf/winbind/winbindnormalizenames.xml   |    2 +-
 examples/misc/adssearch.pl                         |    2 +-
 lib/util/params.c                                  |    2 +-
 librpc/gen_ndr/ndr_samr.c                          |    2 +-
 librpc/gen_ndr/samr.h                              |    4 +-
 librpc/gen_ndr/winreg.h                            |    4 +
 librpc/idl/samr.idl                                |    4 +-
 librpc/idl/winreg.idl                              |   20 +++++
 nsswitch/libwbclient/wbc_pam.c                     |    5 -
 source3/configure.in                               |    2 +-
 source3/include/rpc_secdes.h                       |   38 --------
 source3/lib/fault.c                                |    7 +-
 source3/lib/netapi/group.c                         |   18 ++--
 source3/lib/netapi/localgroup.c                    |   25 +++---
 source3/lib/netapi/user.c                          |   30 +++---
 source3/lib/smbconf/smbconf_reg.c                  |    2 +-
 source3/libads/ldap.c                              |   10 ++
 source3/libads/ldap_printer.c                      |    2 +-
 source3/libnet/libnet_join.c                       |   12 ++--
 source3/libsmb/cliconnect.c                        |    2 +-
 source3/libsmb/libsmb_server.c                     |    2 +-
 source3/modules/vfs_shadow_copy2.c                 |    5 +-
 source3/param/loadparm.c                           |   24 +++++-
 source3/printing/nt_printing.c                     |   13 ++--
 source3/registry/reg_api.c                         |   38 +++++---
 source3/rpc_server/srv_lsa_nt.c                    |   10 ++-
 source3/rpc_server/srv_samr_nt.c                   |   15 +--
 source3/rpc_server/srv_spoolss_nt.c                |   23 ++++--
 source3/rpc_server/srv_svcctl_nt.c                 |    6 +-
 source3/rpcclient/cmd_lsarpc.c                     |   48 +++++-----
 source3/rpcclient/cmd_samr.c                       |    4 +-
 source3/rpcclient/cmd_test.c                       |    2 +-
 source3/rpcclient/rpcclient.c                      |    2 +-
 source3/script/installmodules.sh                   |    5 +
 source3/script/tests/test_posix_s3.sh              |    3 +-
 source3/script/tests/test_wbinfo_s3.sh             |    2 +
 source3/script/uninstallmo.sh                      |    3 +-
 source3/services/svc_spoolss.c                     |    4 +
 source3/smbd/lanman.c                              |    6 +-
 source3/smbd/open.c                                |    8 +-
 source3/smbd/posix_acls.c                          |   76 ++++++++++++++--
 source3/smbd/uid.c                                 |   11 +++
 source3/torture/torture.c                          |   45 ++++++++++
 source3/utils/net.c                                |    1 +
 source3/utils/net.h                                |    1 +
 source3/utils/net_conf.c                           |    8 ++
 source3/utils/net_registry.c                       |    6 +-
 source3/utils/net_rpc.c                            |   46 ++++++----
 source3/utils/net_rpc_audit.c                      |    8 +-
 source3/utils/net_rpc_join.c                       |    6 +-
 source3/utils/net_rpc_registry.c                   |   14 ++--
 source3/utils/net_rpc_rights.c                     |   10 +-
 source3/utils/net_util.c                           |    4 +-
 source3/utils/netlookup.c                          |    2 +-
 source3/utils/smbcquotas.c                         |    2 +-
 source3/utils/smbpasswd.c                          |   16 ++--
 source3/winbindd/idmap.c                           |    2 +
 source3/winbindd/winbindd_cm.c                     |   18 ++--
 source3/winbindd/winbindd_rpc.c                    |    6 +-
 source4/rpc_server/lsa/dcesrv_lsa.c                |    2 +-
 source4/torture/rpc/lsa_lookup.c                   |   90 ++++++++++++++++++++
 source4/torture/rpc/rpc.c                          |    1 +
 source4/torture/rpc/samr.c                         |    4 +-
 source4/torture/rpc/samr_accessmask.c              |   22 +++--
 source4/torture/rpc/spoolss.c                      |   62 +++++++++-----
 source4/torture/rpc/spoolss_win.c                  |    7 ++
 source4/torture/rpc/svcctl.c                       |   82 +++++++++++++++++--
 69 files changed, 696 insertions(+), 290 deletions(-)
 mode change 100644 => 100755 source3/script/installmo.sh
 mode change 100644 => 100755 source3/script/uninstallmo.sh


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 3eb0c90..826b916 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -35,6 +35,7 @@
 		<arg choice="opt">-P</arg>
 		<arg choice="opt">-d debuglevel</arg>
 		<arg choice="opt">-V</arg>
+		<arg choice="opt">--request-timeout seconds</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -125,6 +126,14 @@
 		</para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>--request-timeout 30</term>
+		<listitem><para>
+		Let client requests timeout after 30 seconds the default is 10
+		seconds.
+		</para></listitem>
+		</varlistentry>
+
 		&stdarg.server.debug;
 	</variablelist>
 </refsect1>
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml
index 1d6f0df..ced6174 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.7.xml
@@ -142,8 +142,15 @@
 		</para></listitem>
 		</varlistentry>
 
-		</variablelist>
+		<varlistentry>
+		<term>warn_pwd_expire</term>
+		<listitem><para>
+		Defines number of days before pam_winbind starts to warn about passwords that are
+		going to expire. Defaults to 14 days.
+		</para></listitem>
+		</varlistentry>
 
+		</variablelist>
 
 	</para>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index 5b68bca..ba71686 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -16,7 +16,7 @@
         </para>
 
 	<para>This feature also enables the name aliasing API which can
-	  be used to make domain user and group names to a non-qlaified
+	  be used to make domain user and group names to a non-qualified
 	  version.  Please refer to the manpage for the configured
 	  idmap and nss_info plugin for the specifics on how to configure
 	  name aliasing for a specific configuration.  Name aliasing takes
diff --git a/examples/misc/adssearch.pl b/examples/misc/adssearch.pl
index d17e680..026853d 100755
--- a/examples/misc/adssearch.pl
+++ b/examples/misc/adssearch.pl
@@ -735,7 +735,7 @@ sub get_machine_password {
 			($line,$password) = split(/"/, $line);
 			last;
 		}
-		if ($line =~ /$key/) {
+		if ($line =~ /\"$key\"/) {
 			$found = 1;
 		}
 	}
diff --git a/lib/util/params.c b/lib/util/params.c
index 7af7ac7..80adc71 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -572,7 +572,7 @@ bool pm_process( const char *FileName,
 
   if( !result )                               /* Generic failure. */
     {
-    DEBUG(0,("%s Failed.  Error returned from params.c:parse().\n", func));
+    DEBUG(3,("%s Failed.  Error returned from params.c:parse().\n", func));
     return( false );
     }
 
diff --git a/librpc/gen_ndr/ndr_samr.c b/librpc/gen_ndr/ndr_samr.c
index 33c70ce..d2d345a 100644
--- a/librpc/gen_ndr/ndr_samr.c
+++ b/librpc/gen_ndr/ndr_samr.c
@@ -122,7 +122,7 @@ _PUBLIC_ void ndr_print_samr_ConnectAccessMask(struct ndr_print *ndr, const char
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_INITIALIZE_SERVER", SAMR_ACCESS_INITIALIZE_SERVER, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_CREATE_DOMAIN", SAMR_ACCESS_CREATE_DOMAIN, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_ENUM_DOMAINS", SAMR_ACCESS_ENUM_DOMAINS, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_OPEN_DOMAIN", SAMR_ACCESS_OPEN_DOMAIN, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SAMR_ACCESS_LOOKUP_DOMAIN", SAMR_ACCESS_LOOKUP_DOMAIN, r);
 	ndr->depth--;
 }
 
diff --git a/librpc/gen_ndr/samr.h b/librpc/gen_ndr/samr.h
index 0447564..16c6605 100644
--- a/librpc/gen_ndr/samr.h
+++ b/librpc/gen_ndr/samr.h
@@ -14,7 +14,7 @@
 #define GENERIC_RIGHTS_SAM_ALL_ACCESS	( (STANDARD_RIGHTS_REQUIRED_ACCESS|SAMR_ACCESS_ALL_ACCESS) )
 #define GENERIC_RIGHTS_SAM_READ	( (STANDARD_RIGHTS_READ_ACCESS|SAMR_ACCESS_ENUM_DOMAINS) )
 #define GENERIC_RIGHTS_SAM_WRITE	( (STANDARD_RIGHTS_WRITE_ACCESS|SAMR_ACCESS_CREATE_DOMAIN|SAMR_ACCESS_INITIALIZE_SERVER|SAMR_ACCESS_SHUTDOWN_SERVER) )
-#define GENERIC_RIGHTS_SAM_EXECUTE	( (STANDARD_RIGHTS_EXECUTE_ACCESS|SAMR_ACCESS_OPEN_DOMAIN|SAMR_ACCESS_CONNECT_TO_SERVER) )
+#define GENERIC_RIGHTS_SAM_EXECUTE	( (STANDARD_RIGHTS_EXECUTE_ACCESS|SAMR_ACCESS_LOOKUP_DOMAIN|SAMR_ACCESS_CONNECT_TO_SERVER) )
 #define SAMR_USER_ACCESS_ALL_ACCESS	( 0x000007FF )
 #define GENERIC_RIGHTS_USER_ALL_ACCESS	( (STANDARD_RIGHTS_REQUIRED_ACCESS|SAMR_USER_ACCESS_ALL_ACCESS) )
 #define GENERIC_RIGHTS_USER_READ	( (STANDARD_RIGHTS_READ_ACCESS|SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP|SAMR_USER_ACCESS_GET_GROUPS|SAMR_USER_ACCESS_GET_ATTRIBUTES|SAMR_USER_ACCESS_GET_LOGONINFO|SAMR_USER_ACCESS_GET_LOCALE) )
@@ -97,7 +97,7 @@ enum samr_RejectReason
 #define SAMR_ACCESS_INITIALIZE_SERVER ( 0x00000004 )
 #define SAMR_ACCESS_CREATE_DOMAIN ( 0x00000008 )
 #define SAMR_ACCESS_ENUM_DOMAINS ( 0x00000010 )
-#define SAMR_ACCESS_OPEN_DOMAIN ( 0x00000020 )
+#define SAMR_ACCESS_LOOKUP_DOMAIN ( 0x00000020 )
 
 /* bitmap samr_UserAccessMask */
 #define SAMR_USER_ACCESS_GET_NAME_ETC ( 0x00000001 )
diff --git a/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h
index e0300fd..103817c 100644
--- a/librpc/gen_ndr/winreg.h
+++ b/librpc/gen_ndr/winreg.h
@@ -9,6 +9,10 @@
 #ifndef _HEADER_winreg
 #define _HEADER_winreg
 
+#define REG_KEY_READ	( (STANDARD_RIGHTS_READ_ACCESS|KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS|KEY_NOTIFY) )
+#define REG_KEY_EXECUTE	( REG_KEY_READ )
+#define REG_KEY_WRITE	( (STANDARD_RIGHTS_WRITE_ACCESS|KEY_SET_VALUE|KEY_CREATE_SUB_KEY) )
+#define REG_KEY_ALL	( (STANDARD_RIGHTS_REQUIRED_ACCESS|REG_KEY_READ|REG_KEY_WRITE|KEY_CREATE_LINK) )
 /* bitmap winreg_AccessMask */
 #define KEY_QUERY_VALUE ( 0x00001 )
 #define KEY_SET_VALUE ( 0x00002 )
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index 7d5d877..bcd8ca0 100644
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -64,7 +64,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 		SAMR_ACCESS_INITIALIZE_SERVER   = 0x00000004,
 		SAMR_ACCESS_CREATE_DOMAIN       = 0x00000008,
 		SAMR_ACCESS_ENUM_DOMAINS        = 0x00000010,
-		SAMR_ACCESS_OPEN_DOMAIN         = 0x00000020
+		SAMR_ACCESS_LOOKUP_DOMAIN         = 0x00000020
 	} samr_ConnectAccessMask;
 
 	const int SAMR_ACCESS_ALL_ACCESS = 0x0000003F;
@@ -85,7 +85,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
 	const int GENERIC_RIGHTS_SAM_EXECUTE =
 		(STANDARD_RIGHTS_EXECUTE_ACCESS		|
-		 SAMR_ACCESS_OPEN_DOMAIN		|
+		 SAMR_ACCESS_LOOKUP_DOMAIN		|
 		 SAMR_ACCESS_CONNECT_TO_SERVER);
 
 	/* User Object specific access rights */
diff --git a/librpc/idl/winreg.idl b/librpc/idl/winreg.idl
index b905bde..18b5edc 100644
--- a/librpc/idl/winreg.idl
+++ b/librpc/idl/winreg.idl
@@ -14,6 +14,10 @@ import "lsa.idl", "security.idl";
 {
 	typedef bitmap security_secinfo security_secinfo;
 
+	/*
+	 * Access Bits for registry ACLS
+	 */
+
 	typedef [bitmap32bit] bitmap {
 		KEY_QUERY_VALUE 		= 0x00001,
 		KEY_SET_VALUE 			= 0x00002,
@@ -25,6 +29,22 @@ import "lsa.idl", "security.idl";
 		KEY_WOW64_32KEY 		= 0x00200
 	} winreg_AccessMask;
 
+	const int REG_KEY_READ = (	STANDARD_RIGHTS_READ_ACCESS	|
+					KEY_QUERY_VALUE			|
+					KEY_ENUMERATE_SUB_KEYS 		|
+					KEY_NOTIFY);
+
+	const int REG_KEY_EXECUTE = REG_KEY_READ;
+
+	const int REG_KEY_WRITE = (	STANDARD_RIGHTS_WRITE_ACCESS	|
+					KEY_SET_VALUE	 		|
+					KEY_CREATE_SUB_KEY);
+
+	const int REG_KEY_ALL = (	STANDARD_RIGHTS_REQUIRED_ACCESS |
+					REG_KEY_READ 			|
+					REG_KEY_WRITE 			|
+					KEY_CREATE_LINK);
+
 	typedef [public,v1_enum] enum {
 		REG_NONE                       = 0,
 		REG_SZ                         = 1,
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 92c6643..61ce2a1 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -810,11 +810,6 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params,
 		break;
 	}
 
-	if (cmd == 0) {
-		wbc_status = WBC_ERR_INVALID_PARAM;
-		BAIL_ON_WBC_ERROR(wbc_status);
-	}
-
 	/* Send request */
 
 	wbc_status = wbcRequestResponse(cmd,
diff --git a/source3/configure.in b/source3/configure.in
index 57da8eb..d44df14 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -284,7 +284,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then
         else
            AC_MSG_CHECKING(GNU ld release version)
            changequote(,)dnl
-           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
            ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
            ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
            changequote([,])dnl
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index c74d621..6db3f2d 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -121,9 +121,6 @@ struct standard_mapping {
 #define STANDARD_RIGHTS_MASK	0x00FF0000
 #define GENERIC_RIGHTS_MASK	0xF0000000
 
-#define SEC_RIGHT_SYSTEM_SECURITY	0x01000000
-#define SEC_RIGHT_MAXIMUM_ALLOWED	0x02000000
-
 /* Generic access rights */
 
 #define GENERIC_RIGHT_ALL_ACCESS	0x10000000
@@ -194,39 +191,4 @@ struct standard_mapping {
 		SA_RIGHT_FILE_WRITE_DATA	| \
 		SA_RIGHT_FILE_READ_DATA)
 
-/*
- * Access Bits for registry ACLS
- */
-
-/* used by registry ACLs */
-
-#define SEC_RIGHTS_QUERY_VALUE		0x00000001
-#define SEC_RIGHTS_SET_VALUE		0x00000002
-#define SEC_RIGHTS_CREATE_SUBKEY	0x00000004
-#define SEC_RIGHTS_ENUM_SUBKEYS		0x00000008
-#define SEC_RIGHTS_NOTIFY		0x00000010
-#define SEC_RIGHTS_CREATE_LINK		0x00000020
-#define SEC_RIGHTS_MAXIMUM_ALLOWED	0x02000000
-
-
-#define REG_KEY_READ \
-	( STANDARD_RIGHTS_READ_ACCESS 		|\
-	  SEC_RIGHTS_QUERY_VALUE 		|\
-	  SEC_RIGHTS_ENUM_SUBKEYS 		|\
-	  SEC_RIGHTS_NOTIFY )
-	  
-#define REG_KEY_EXECUTE	REG_KEY_READ
-
-#define REG_KEY_WRITE \
-	( STANDARD_RIGHTS_WRITE_ACCESS		|\
-	  SEC_RIGHTS_SET_VALUE 			|\
-	  SEC_RIGHTS_CREATE_SUBKEY )
-
-#define REG_KEY_ALL \
-	( STANDARD_RIGHTS_REQUIRED_ACCESS 	|\
-	  REG_KEY_READ 				|\
-	  REG_KEY_WRITE 			|\
-	  SEC_RIGHTS_CREATE_LINK )
-
-
 #endif /* _RPC_SECDES_H */
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index efd1ddd..51fc53b 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -194,17 +194,18 @@ static char *get_freebsd_corepath(void)
  */
 static char *get_corepath(const char *logbase, const char *progname)
 {
-	char *tmp_corepath = NULL;
+#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
 
 	/* @todo: Add support for the linux corepath. */
-#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
+
+	char *tmp_corepath = NULL;
 	tmp_corepath = get_freebsd_corepath();
-#endif
 
 	/* If this has been set correctly, we're done. */
 	if (tmp_corepath) {
 		return tmp_corepath;
 	}
+#endif
 
 	/* Fall back to the default. */
 	return get_default_corepath(logbase, progname);
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index c09632a..004fd3a 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -79,7 +79,7 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_CREATE_GROUP |
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
@@ -250,7 +250,7 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -415,7 +415,7 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -650,7 +650,7 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -766,7 +766,7 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -887,7 +887,7 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -1165,7 +1165,7 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
 					  SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
@@ -1296,7 +1296,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -1448,7 +1448,7 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index 13405b5..d389c1f 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -157,7 +157,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 						  &connect_handle,
@@ -182,7 +182,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
@@ -277,7 +277,7 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 						  &connect_handle,
@@ -302,7 +302,7 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
@@ -449,7 +449,7 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 						  &connect_handle,
@@ -474,7 +474,7 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_CREATE_ALIAS |
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
@@ -620,7 +620,7 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 						  &connect_handle,
@@ -647,7 +647,7 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,
 					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 					  &connect_handle,
 					  &domain_handle,
@@ -762,7 +762,7 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
 						  SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
@@ -774,7 +774,7 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
-					  SAMR_ACCESS_OPEN_DOMAIN |
+					  SAMR_ACCESS_LOOKUP_DOMAIN |
 					  SAMR_ACCESS_ENUM_DOMAINS,
 					  SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
 					  SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
@@ -1068,7 +1068,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_samr_open_builtin_domain(ctx, pipe_cli,
-						  SAMR_ACCESS_OPEN_DOMAIN |
+						  SAMR_ACCESS_LOOKUP_DOMAIN |
 						  SAMR_ACCESS_ENUM_DOMAINS,
 						  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
 						  &connect_handle,
@@ -1098,7 +1098,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
 					  SAMR_ACCESS_ENUM_DOMAINS |
-					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_ACCESS_LOOKUP_DOMAIN,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list