date:20080520

On Tue, May 20, 2008 at 02:17:27PM -0400, Greene, Joe wrote:
 Scenario: 
 
 Citrix, Win2k3.
 
 Solaris 9 Server - latest Solaris patch Samba 3.0.25c
 
  
 
 Every Monday morning, since applying the latest Solaris patches which
 upgraded samba from 3.0.21b - 3.0.25c, the following occurs. The Citrix
 clients can no longer print. 
 
 Active directory was also switched to 2003 native mode.
 
  
 
 Sunday night, Citrix servers undergo a weekly reboot. 
 
 Week 1 and 2:Monday morning start of business the Citrix clients cannot
 print to the Samba print shares. Restart Samba, service restored.
 
 Week 3 and 4: Monday Morning before start of business, restart samba via
 cron  scheduler,  Start of business, Citrix clients cannot print..
 restart samba again.. service restored.
 
 Week 5: Admin on site. Manually restart samba, test user tries to print
 and cannot, however smbstatus shows the citrix server connects and pulls
 the data file for formatting the raw print job, but the print share
 never registers an access. restart samba again, Citrix server pulls file
 and printer session registers in smbstatus.
 
  
 
 Week 6: I'm dreading this. Rollback to 3.0.21b?

Need more info I'm afraid. What do the debug logs
for smbd say ?

Jeremy.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Re: [Samba] Re: Write Once Read Many share with samba

2008-05-20 Thread Mike Wilkinson


Jean-Yves Avenard wrote:

Hi

2008/5/20 Brian May [EMAIL PROTECTED]:
  

I don't think it is possible with Unix or Samba permissions to:

* allow file writes but deny file appends (and other modifications?).
* allow creating files but deny creating folders.

which appears to be what you have done under windows.



This was my thoughts.
Samba is running on a FreeBSD 6.3 AMD64 server, filesystem is UFS.

I don't know of any ACL tools...

  
How about a VFS module that overrides just open, rmdir, rename and 
unlink? unlink/rmdir/rename becomes a no-op, open for write fails if the 
file exists?

--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

[Samba] squid + samba error

2008-05-20 Thread Wilson A. Galafassi Jr.

Hello to all.

I´m using squid + samba to authenticate my users with active directory.

The error occour only in the first time i authenticate an user.

All works fine, but i have this is my logs:

== /var/log/samba/log.winbindd ==
[2008/05/21 00:32:36, 2] nsswitch/winbindd_util.c:add_trusted_domain(171)
  Added domain BUILTIN  S-1-5-32
[2008/05/21 00:32:37, 2] libsmb/cliconnect.c:cli_session_setup_kerberos(615)
  Doing kerberos session setup
[2008/05/21 00:35:56, 1] nsswitch/winbindd_sid.c:winbindd_sid_to_gid(312)
  Could not get convert sid  from string
[2008/05/21 00:47:01, 1] nsswitch/winbindd_sid.c:winbindd_sid_to_gid(312)
  Could not get convert sid  from string
[2008/05/21 00:48:57, 1] nsswitch/winbindd_sid.c:winbindd_sid_to_gid(312)
  Could not get convert sid  from string

== /var/log/samba/log.winbindd-idmap ==
[2008/05/21 00:47:01, 2] nsswitch/idmap.c:idmap_new_mapping(957)
  gid allocation failed! Can't create mapping
[2008/05/21 00:47:01, 1] nsswitch/idmap_tdb.c:idmap_tdb_allocate_id(470)
  Fatal Error: GID range full!! (max: 2)
[2008/05/21 00:47:01, 2] nsswitch/idmap.c:idmap_new_mapping(957)
  gid allocation failed! Can't create mapping
[2008/05/21 00:47:01, 1] nsswitch/idmap_tdb.c:idmap_tdb_allocate_id(470)
  Fatal Error: GID range full!! (max: 2)
[2008/05/21 00:47:01, 2] nsswitch/idmap.c:idmap_new_mapping(957)
  gid allocation failed! Can't create mapping

my smb.conf

workgroup = DIGITALSTORAGESD
password server = SERVER2003
realm = DIGITALSTORAGESD.LOCAL
security = ADS
netbios name = netserver

# DefiniÃ§s do winbind
bind interfaces only = yes
winbind separator = /
winbind uid = 1-2
winbind gid = 1-2
winbind enum users = yes
winbind enum groups = yes
winbind enum groups = yes
winbind use default domain = yes

log file = /var/log/samba/log.%m
log level = 2
max log size = 1000

my samba version: samba-3.0.28a-0

What i can to solve that error?

Thanks,
Wilson Galafassi

--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Re: [Samba] Unable to access linux files from windows using samba configured in linux Vmware

2008-05-20 Thread gforgcc

Napster wrote:

I had thw same issue with my networkcheck if the DNS translation for
the Ip address of the system thats running Samba server.Or there is a work
around to get this working...
Check if u\you are able to access the files by going to the run option and
then entering the ip address
start-Run-\\192.168.0.143

Go to c:\windows\system32\drivers\etc\ there you would find a file by the
name hosts add the ip address and also the host name for the server there.
The file would look like this

# Copyright (c) 1993-1999 Microsoft Corp.
#
# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
#
# This file contains the mappings of IP addresses to host names. Each
# entry should be kept on an individual line. The IP address should
# be placed in the first column followed by the corresponding host name.
# The IP address and the host name should be separated by at least one
# space.
#
# Additionally, comments (such as these) may be inserted on individual
# lines or following the machine name denoted by a '#' symbol.
#
# For example:
#
# 102.54.94.97 rhino.acme.com # source server
# 38.25.63.10 x.acme.com # x client host

127.0.0.1 localhost
192.168.0.143 napster-server1

Where 192.168.0.143 is the ip address of the system thats running Samba
and napter-Server1 the hostname.

If you are running DNS server then check the configuration file of the
server.

Napster:working:

Thanks for the reply Napster,
but i dint get exactly what you are telling..
say in my case i am running Vmware linux running Samba of which the IP
address is 192.168.248.195 and hostname is just localhost.localdomain.. so i
added an entry to the file you have said above in windows hosts file.. but
still it is not working. it is telling the same problem..
and can you please tell me where to check the configuratyion file of the DNS
Server ?
--
View this message in context:
http://www.nabble.com/Unable-to-access-linux-files-from-windows-using-samba-configured-in-linux-Vmware-tp16847019p17356339.html
Sent from the Samba - General mailing list archive at Nabble.com.

--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba

HP CIFS and ExtAuth Module

2008-05-20 Thread Michael Ober

Will the HP CIFS and the Patchworks External Authentication modules work
together.  Basically, I want our VMS system to update UAF passwords from
a Windows AD domain.
 
Thanks,
Mike Ober.
 
PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING:

http://www.catb.org/~esr/faqs/smart-questions.html

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-95-gbfb9ee0

The branch, v3-2-stable has been updated
   via  bfb9ee0b50e011a9235fb3634c5ba30a6031ed8f (commit)
  from  2b5a6347ee56aa90df54ecfe94059d9247493beb (commit)

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


- Log -
commit bfb9ee0b50e011a9235fb3634c5ba30a6031ed8f
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Mon May 19 13:11:27 2008 -0700

Restructuring of code to fix #5460. Remove search
by name code from conn, we were already doing the
same check in the dfs_redirect() function, so move
it into parse_dfs_path() instead.
Jeremy.
(cherry picked from commit f1021e4c8d5ace6356c5b2106153288a6eb89a6b)

---

Summary of changes:
 source/smbd/conn.c  |   22 --
 source/smbd/msdfs.c |   28 
 2 files changed, 12 insertions(+), 38 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index 97861ed..c5a2df4 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -85,28 +85,6 @@ connection_struct *conn_find(unsigned cnum)
 }
 
 /
- Find a conn given a service name.
-/
-
-connection_struct *conn_find_byname(const char *service)
-{
-   connection_struct *conn;
-
-   for (conn=Connections;conn;conn=conn-next) {
-   if (strequal(lp_servicename(SNUM(conn)),service)) {
-   if (conn != Connections) {
-   /* Promote if not first. */
-   DLIST_PROMOTE(Connections, conn);
-   }
-   return conn;
-   }
-   }
-
-   return NULL;
-}
-
-
-/
   find first available connection slot, starting from a random position.
 The randomisation stops problems with the server dieing and clients
 thinking the server is still available.
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index eaa66ef..f0dd900 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -36,13 +36,17 @@ extern uint32 global_client_caps;
  SVAL(inbuf,smb_flg2)  FLAGS2_DFS_PATHNAMES bit and then
  send a local path, we have to cope with that too
 
+ If conn != NULL then ensure the provided service is
+ the one pointed to by the connection.
+
  This version does everything using pointers within one copy of the
  pathname string, talloced on the struct dfs_path pointer (which
  must be talloced). This may be too clever to live
  JRA.
 **/
 
-static NTSTATUS parse_dfs_path(const char *pathname,
+static NTSTATUS parse_dfs_path(connection_struct *conn,
+   const char *pathname,
bool allow_wcards,
struct dfs_path *pdp, /* MUST BE TALLOCED */
bool *ppath_contains_wcard)
@@ -136,7 +140,10 @@ static NTSTATUS parse_dfs_path(const char *pathname,
}
 
/* Is this really our servicename ? */
-   if (NULL == conn_find_byname(servicename)) {
+   if (conn  !( strequal(servicename, lp_servicename(SNUM(conn)))
+   || (strequal(servicename, HOMES_NAME)
+strequal(lp_servicename(SNUM(conn)),
+   get_current_username()) )) ) {
DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
servicename));
 
@@ -621,7 +628,7 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
return NT_STATUS_NO_MEMORY;
}
 
-   status = parse_dfs_path(path_in, search_wcard_flag, pdp,
+   status = parse_dfs_path(conn, path_in, search_wcard_flag, pdp,
ppath_contains_wcard);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(pdp);
@@ -662,17 +669,6 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
return NT_STATUS_OK;
}
 
-   if (!( strequal(pdp-servicename, lp_servicename(SNUM(conn)))
-   || (strequal(pdp-servicename, HOMES_NAME)
-strequal(lp_servicename(SNUM(conn)),
-   get_current_username()) )) ) {
-
-   /* The given sharename doesn't match this connection. */
-   TALLOC_FREE(pdp);
-
-   return NT_STATUS_OBJECT_PATH_NOT_FOUND;
-   }
-
status = dfs_path_lookup(ctx, conn, path_in, pdp,
search_wcard_flag, NULL, NULL);
if (!NT_STATUS_IS_OK(status)) {
@@ -758,7 +754,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
ZERO_STRUCT(conns);
*self_referralp = False;
 
-   status =

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2363-gd9db027

The branch, v3-2-test has been updated
   via  d9db027eae260ca53bfb1c687e0e86c97db94dfb (commit)
  from  f1021e4c8d5ace6356c5b2106153288a6eb89a6b (commit)

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


- Log -
commit d9db027eae260ca53bfb1c687e0e86c97db94dfb
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 08:51:15 2008 +0200

WHATSNEW: Update changes since 3.2.0pre3.

Karolin

---

Summary of changes:
 WHATSNEW.txt |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e0a7634..56fca9c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -234,6 +234,7 @@ o   Alexander Bokovoy [EMAIL PROTECTED]
 
 o   GÃ¼nther Deschner [EMAIL PROTECTED]
 * BUG 5465: Fix joining with createcomputer=ou1/ou2/ou3.
+* BUG 5461: Fix issue with Citrix on Samba DCs with more than 900 groups.
 * Fix wins null pointer crash in nss_wins module.
 * Fix lm session key length in _netr_LogonSamLogon.
 * Add -f switch for DsGetDCName() example and be more verbose on output.


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-96-gef8b620

The branch, v3-2-stable has been updated
   via  ef8b620edc77b23a8849ec469768d8f220c4e895 (commit)
  from  bfb9ee0b50e011a9235fb3634c5ba30a6031ed8f (commit)

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


- Log -
commit ef8b620edc77b23a8849ec469768d8f220c4e895
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 08:51:15 2008 +0200

WHATSNEW: Update changes since 3.2.0pre3.

Karolin
(cherry picked from commit d9db027eae260ca53bfb1c687e0e86c97db94dfb)

---

Summary of changes:
 WHATSNEW.txt |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e0a7634..56fca9c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -234,6 +234,7 @@ o   Alexander Bokovoy [EMAIL PROTECTED]
 
 o   GÃ¼nther Deschner [EMAIL PROTECTED]
 * BUG 5465: Fix joining with createcomputer=ou1/ou2/ou3.
+* BUG 5461: Fix issue with Citrix on Samba DCs with more than 900 groups.
 * Fix wins null pointer crash in nss_wins module.
 * Fix lm session key length in _netr_LogonSamLogon.
 * Add -f switch for DsGetDCName() example and be more verbose on output.


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2364-gb09f65f

The branch, v3-2-test has been updated
   via  b09f65f9d0b71760cddf42c82eac549ae13d7574 (commit)
  from  d9db027eae260ca53bfb1c687e0e86c97db94dfb (commit)

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


- Log -
commit b09f65f9d0b71760cddf42c82eac549ae13d7574
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Fri May 16 13:24:15 2008 +0200

Fix Bug #5461 and implement a very basic _samr_GetDisplayEnumerationIndex().

Citrix PM cannot use a Samba DC when having more then 900 groups as citrix
insists on calling _samr_GetDisplayEnumerationIndex() after receiving the 
first
900 groups via _samr_QueryDisplayInfo() to get the continuation index.

Guenther
(cherry picked from commit 1c4adc8dda68eae9839bdff843aadf8c98dd9e87)

---

Summary of changes:
 source/rpc_server/srv_samr_nt.c |  159 ++-
 1 files changed, 139 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 0d9dd55..f28c771 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -5652,6 +5652,145 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
 }
 
 /
+ _samr_GetDisplayEnumerationIndex
+/
+
+NTSTATUS _samr_GetDisplayEnumerationIndex(pipes_struct *p,
+ struct 
samr_GetDisplayEnumerationIndex *r)
+{
+   struct samr_info *info = NULL;
+   uint32_t max_entries = (uint32_t) -1;
+   uint32_t enum_context = 0;
+   int i;
+   uint32_t num_account = 0;
+   struct samr_displayentry *entries = NULL;
+
+   DEBUG(5,(_samr_GetDisplayEnumerationIndex: %d\n, __LINE__));
+
+   /* find the policy handle.  open a policy on it. */
+   if (!find_policy_by_hnd(p, r-in.domain_handle, (void **)(void 
*)info)) {
+   return NT_STATUS_INVALID_HANDLE;
+   }
+
+   if ((r-in.level  1) || (r-in.level  3)) {
+   DEBUG(0,(_samr_GetDisplayEnumerationIndex: 
+   Unknown info level (%u)\n,
+   r-in.level));
+   return NT_STATUS_INVALID_INFO_CLASS;
+   }
+
+   become_root();
+
+   /* The following done as ROOT. Don't return without unbecome_root(). */
+
+   switch (r-in.level) {
+   case 1:
+   if (info-disp_info-users == NULL) {
+   info-disp_info-users = pdb_search_users(ACB_NORMAL);
+   if (info-disp_info-users == NULL) {
+   unbecome_root();
+   return NT_STATUS_ACCESS_DENIED;
+   }
+   DEBUG(10,(_samr_GetDisplayEnumerationIndex: 
+   starting user enumeration at index %u\n,
+   (unsigned int)enum_context));
+   } else {
+   DEBUG(10,(_samr_GetDisplayEnumerationIndex: 
+   using cached user enumeration at index %u\n,
+   (unsigned int)enum_context));
+   }
+   num_account = pdb_search_entries(info-disp_info-users,
+enum_context, max_entries,
+entries);
+   break;
+   case 2:
+   if (info-disp_info-machines == NULL) {
+   info-disp_info-machines =
+   pdb_search_users(ACB_WSTRUST|ACB_SVRTRUST);
+   if (info-disp_info-machines == NULL) {
+   unbecome_root();
+   return NT_STATUS_ACCESS_DENIED;
+   }
+   DEBUG(10,(_samr_GetDisplayEnumerationIndex: 
+   starting machine enumeration at index %u\n,
+   (unsigned int)enum_context));
+   } else {
+   DEBUG(10,(_samr_GetDisplayEnumerationIndex: 
+   using cached machine enumeration at index 
%u\n,
+   (unsigned int)enum_context));
+   }
+   num_account = pdb_search_entries(info-disp_info-machines,
+enum_context, max_entries,
+entries);
+   break;
+   case 3:
+   if (info-disp_info-groups == NULL) {
+   info-disp_info-groups = pdb_search_groups();
+   if (info-disp_info-groups == NULL) {
+   unbecome_root();
+   return

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-99-g1162b4f

The branch, v3-2-stable has been updated
   via  1162b4f5a16b937ead40ee7787489a22c868875f (commit)
   via  e0e7fae322cdcfe4f2c88c943a954e3da3d91605 (commit)
   via  df97bdf8a29f044e3c21df1fde9ca59652b01d9c (commit)
  from  ef8b620edc77b23a8849ec469768d8f220c4e895 (commit)

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


- Log -
commit 1162b4f5a16b937ead40ee7787489a22c868875f
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Wed Apr 23 10:55:26 2008 +0200

rpcclient: Add tiny fix for cmd_samr_get_dispinfo_idx().

Guenther
(cherry picked from commit c15b5d73badafdc93066197aef72e37a8b99)

commit e0e7fae322cdcfe4f2c88c943a954e3da3d91605
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue Apr 22 23:11:53 2008 +0200

rpcclient: Add getdispinfoidx command.

Guenther
(cherry picked from commit 7d8461d080c92a83bd7a8d168fdf1fe98e8bec9a)

commit df97bdf8a29f044e3c21df1fde9ca59652b01d9c
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 6 15:06:12 2008 +0200

Fix a memleak in construct_printer_info_7()

Also fix a ignoring asprintf result warning
(cherry picked from commit 64d21f39636019d6a17f84efc6fb9e61e67a235e)

---

Summary of changes:
 source/rpc_server/srv_spoolss_nt.c |7 +++-
 source/rpcclient/cmd_samr.c|   63 
 2 files changed, 68 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_spoolss_nt.c 
b/source/rpc_server/srv_spoolss_nt.c
index da1528f..a8aa339 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -4361,10 +4361,13 @@ static bool construct_printer_info_7(Printer_entry 
*print_hnd, PRINTER_INFO_7 *p
struct GUID guid;
 
if (is_printer_published(print_hnd, snum, guid)) {
-   asprintf(guid_str, {%s},
-smb_uuid_string(talloc_tos(), guid));
+   if (asprintf(guid_str, {%s},
+smb_uuid_string(talloc_tos(), guid)) == -1) {
+   return false;
+   }
strupper_m(guid_str);
init_unistr(printer-guid, guid_str);
+   SAFE_FREE(guid_str);
printer-action = SPOOL_DS_PUBLISH;
} else {
init_unistr(printer-guid, );
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index e58354d..5523d2a 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -2565,6 +2565,68 @@ static NTSTATUS cmd_samr_chgpasswd3(struct 
rpc_pipe_client *cli,
return result;
 }
 
+static NTSTATUS cmd_samr_get_dispinfo_idx(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, const char **argv)
+{
+   NTSTATUS status;
+   struct policy_handle connect_handle;
+   struct policy_handle domain_handle;
+   uint16_t level = 1;
+   struct lsa_String name;
+   uint32_t idx = 0;
+
+   if (argc  2 || argc  3) {
+   printf(Usage: %s name level\n, argv[0]);
+   return NT_STATUS_INVALID_PARAMETER;
+   }
+
+   init_lsa_String(name, argv[1]);
+
+   if (argc == 3) {
+   level = atoi(argv[2]);
+   }
+
+   status = rpccli_try_samr_connects(cli, mem_ctx,
+ SEC_RIGHTS_MAXIMUM_ALLOWED,
+ connect_handle);
+
+   if (!NT_STATUS_IS_OK(status)) {
+   goto done;
+   }
+
+   status = rpccli_samr_OpenDomain(cli, mem_ctx,
+   connect_handle,
+   SEC_RIGHTS_MAXIMUM_ALLOWED,
+   domain_sid,
+   domain_handle);
+
+   if (!NT_STATUS_IS_OK(status))
+   goto done;
+
+
+   status = rpccli_samr_GetDisplayEnumerationIndex(cli, mem_ctx,
+   domain_handle,
+   level,
+   name,
+   idx);
+
+   if (NT_STATUS_IS_OK(status) ||
+   NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+   printf(idx: %d (0x%08x)\n, idx, idx);
+   }
+ done:
+
+   if (is_valid_policy_hnd(domain_handle)) {
+   rpccli_samr_Close(cli, mem_ctx, domain_handle);
+   }
+   if (is_valid_policy_hnd(connect_handle)) {
+   rpccli_samr_Close(cli, mem_ctx, connect_handle);
+   }
+
+   return status;
+
+}
 /* List of commands exported by this module */
 
 struct cmd_set samr_commands[] = {
@@ -2602,5 +2664,6 @@

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2365-g1257d5c

The branch, v3-2-test has been updated
   via  1257d5cf2a4fda0143e1ac9c697a971738366067 (commit)
  from  b09f65f9d0b71760cddf42c82eac549ae13d7574 (commit)

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


- Log -
commit 1257d5cf2a4fda0143e1ac9c697a971738366067
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue Apr 29 20:13:22 2008 +0200

_netr_LogonSamLogon: fix lm session key length.

Thanks Volker for pointing this out.

Guenther
(cherry picked from commit 7ccca9a004c7a4794781cbd7c703c53a0481bd51)

---

Summary of changes:
 source/rpc_server/srv_netlog_nt.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_netlog_nt.c 
b/source/rpc_server/srv_netlog_nt.c
index 4664e8d..203f538 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -1109,7 +1109,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
}
memcpy(pipe_session_key, 
p-auth.a_u.schannel_auth-sess_key, 16);
}
-   SamOEMhash(lm_session_key.key, pipe_session_key, 16);
+   SamOEMhash(lm_session_key.key, pipe_session_key, 8);
memset(pipe_session_key, '\0', 16);
}
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2516-g48bf0b4

The branch, v3-3-test has been updated
   via  48bf0b42a7d3829d476a50b4f6f80022279b4e49 (commit)
   via  1429f3b7cf293994b334052428fcdadcee162dea (commit)
   via  029875d8c9b2f9448f5299faaa3a48e8bccbca53 (commit)
  from  54556df561d03d30b2fc21b9eaabe56b8c758301 (commit)

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


- Log -
commit 48bf0b42a7d3829d476a50b4f6f80022279b4e49
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Fri May 16 09:27:20 2008 +0200

man pages: Remove man page for 'mangled map'.

'mangled map' has been removed with 
dee8beba7a92b8a3f68bbcc59fd0a827f68c7736.

Karolin
(cherry picked from commit d9b4e500675a378daba50d12cd638a245aa78b72)

commit 1429f3b7cf293994b334052428fcdadcee162dea
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 11:09:06 2008 +0200

sesssetup.c: Add debug message.

Log when we kill other smbd sessions like when we hit the VC == 0 case.
This one fixes BUG #5476.
Initial patch from BjÃ¶rn Jacke [EMAIL PROTECTED].

Karolin

commit 029875d8c9b2f9448f5299faaa3a48e8bccbca53
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 11:03:33 2008 +0200

man pages: Add documentation for new cluster parameters.

Karolin

---

Summary of changes:
 docs-xml/smbdotconf/filename/mangledmap.xml   |   33 -
 docs-xml/smbdotconf/misc/clusteraddresses.xml |   17 +
 docs-xml/smbdotconf/misc/clustering.xml   |   17 +
 docs-xml/smbdotconf/misc/ctdbdsocket.xml  |   16 
 source/smbd/sesssetup.c   |3 ++
 5 files changed, 53 insertions(+), 33 deletions(-)
 delete mode 100644 docs-xml/smbdotconf/filename/mangledmap.xml
 create mode 100644 docs-xml/smbdotconf/misc/clusteraddresses.xml
 create mode 100644 docs-xml/smbdotconf/misc/clustering.xml
 create mode 100644 docs-xml/smbdotconf/misc/ctdbdsocket.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/filename/mangledmap.xml 
b/docs-xml/smbdotconf/filename/mangledmap.xml
deleted file mode 100644
index b4be3a8..000
--- a/docs-xml/smbdotconf/filename/mangledmap.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-samba:parameter name=mangled map
-type=string
- context=S
- xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
-description
-   para
-   This is for those who want to directly map UNIX file names which cannot 
be represented on 
-   Windows/DOS.  The mangling of names is not always what is needed.  In 
particular you may have 
-   documents with file extensions that differ between DOS and UNIX. 
-   For example, under UNIX it is common to use filename 
moreinfo=none.html/filename 
-   for HTML files, whereas under Windows/DOS filename 
moreinfo=none.htm/filename 
-   is more commonly used.
-   /para
-
-   para
-   So to map filename moreinfo=nonehtml/filename to filename 
moreinfo=nonehtm/filename 
-   you would use:
-   /para
-   
-   para
-   smbconfoption name=mangled map(*.html *.htm)/smbconfoption.
-   /para
-
-   para
-   One very useful case is to remove the annoying filename 
moreinfo=none;1/filename off 
-   the ends of filenames on some CDROMs (only visible under some UNIXes). 
To do this use a map of 
-   (*;1 *;).
-   /para
-/description
-
-value type=defaultcommentno mangled map/comment/value
-value type=example(*;1 *;)/value
-/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml 
b/docs-xml/smbdotconf/misc/clusteraddresses.xml
new file mode 100644
index 000..d34d550
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -0,0 +1,17 @@
+samba:parameter name=cluster addresses
+context=G
+type=list
+developer=1
+xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraWith this parameter you can add additional addresses
+   nmbd will register with a WINS server. These addresses are not
+   necessarily present on all nodes simultaneously, but they will
+   be registered with the WINS server so that clients can contact
+   any of the nodes.
+   /para
+/description
+
+value type=default/value
+value type=example10.0.0.1 10.0.0.2 10.0.0.3/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/clustering.xml 
b/docs-xml/smbdotconf/misc/clustering.xml
new file mode 100644
index 000..b85934e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -0,0 +1,17 @@
+samba:parameter name=clustering
+ context=G
+type=boolean
+ advanced=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2367-gab83cd9

The branch, v3-2-test has been updated
   via  ab83cd9fc012689191d9a218be5c9f439fa560b5 (commit)
   via  34a947a7886ee848084b9d88f99f8016892f083f (commit)
  from  1257d5cf2a4fda0143e1ac9c697a971738366067 (commit)

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


- Log -
commit ab83cd9fc012689191d9a218be5c9f439fa560b5
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Sun May 4 06:48:31 2008 +0200

Developer's Guide: Fix typos.

Karolin
(cherry picked from commit e206ffb8562c82173c9b426d76e49986fefe)

commit 34a947a7886ee848084b9d88f99f8016892f083f
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 11:03:33 2008 +0200

man pages: Add documentation for new cluster parameters.

Karolin
(cherry picked from commit 029875d8c9b2f9448f5299faaa3a48e8bccbca53)

---

Summary of changes:
 docs-xml/Samba3-Developers-Guide/vfs.xml  |4 ++--
 docs-xml/smbdotconf/misc/clusteraddresses.xml |   17 +
 docs-xml/smbdotconf/misc/clustering.xml   |   17 +
 docs-xml/smbdotconf/misc/ctdbdsocket.xml  |   16 
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/clusteraddresses.xml
 create mode 100644 docs-xml/smbdotconf/misc/clustering.xml
 create mode 100644 docs-xml/smbdotconf/misc/ctdbdsocket.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-Developers-Guide/vfs.xml 
b/docs-xml/Samba3-Developers-Guide/vfs.xml
index 44e0bd6..96d512c 100644
--- a/docs-xml/Samba3-Developers-Guide/vfs.xml
+++ b/docs-xml/Samba3-Developers-Guide/vfs.xml
@@ -553,7 +553,7 @@ you can set this function pointer to NULL./para/listitem
 titleUpgrading to the New VFS Interface/title
 
 sect2
-titleUpgrading from 2.2.* and 3.0aplha modules/title
+titleUpgrading from 2.2.* and 3.0alpha modules/title
 
 orderedlist
 listitempara
@@ -833,7 +833,7 @@ static int example_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
 /para/listitem
 
 listitempara
-To make it easy to build 3rd party modules it would be usefull to provide
+To make it easy to build 3rd party modules it would be useful to provide
 configure.in, (configure), install.sh and Makefile.in with the module.
 (Take a look at the example in filenameexamples/VFS/filename.)
 /para
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml 
b/docs-xml/smbdotconf/misc/clusteraddresses.xml
new file mode 100644
index 000..d34d550
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -0,0 +1,17 @@
+samba:parameter name=cluster addresses
+context=G
+type=list
+developer=1
+xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraWith this parameter you can add additional addresses
+   nmbd will register with a WINS server. These addresses are not
+   necessarily present on all nodes simultaneously, but they will
+   be registered with the WINS server so that clients can contact
+   any of the nodes.
+   /para
+/description
+
+value type=default/value
+value type=example10.0.0.1 10.0.0.2 10.0.0.3/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/clustering.xml 
b/docs-xml/smbdotconf/misc/clustering.xml
new file mode 100644
index 000..b85934e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -0,0 +1,17 @@
+samba:parameter name=clustering
+ context=G
+type=boolean
+ advanced=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraThis parameter specifies whether Samba should contact
+   ctdb for accessing its tdb files and use ctdb as a backend
+   for its messaging backend.
+   /para
+
+   paraSet this parameter to value type=exampleyes/value only if
+   you have a cluster setup with ctdb running.
+   /para
+/description
+value type=defaultno/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml 
b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
new file mode 100644
index 000..a478553
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -0,0 +1,16 @@
+samba:parameter name=ctdbd socket
+ context=G
+ advanced=1
+type=string
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+synonymdefault/synonym
+description
+   paraIf you set value type=exampleclustering=yes/value,
+   you need to tell Samba where ctdbd listens on its unix domain
+   socket. The default path as of ctdb 1.0 is /tmp/ctdb.socket which
+   you have to explicitly set for Samba in smb.conf.
+   /para
+/description
+value type=default/value
+value type=example/tmp/ctdb.socket/value
+/samba:parameter

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-101-gab07c25

The branch, v3-2-stable has been updated
   via  ab07c252d73534b50101975f742117477c92490e (commit)
   via  16adac4ea96e2234fd1253d0b866b0654bed9f8e (commit)
  from  1162b4f5a16b937ead40ee7787489a22c868875f (commit)

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


- Log -
commit ab07c252d73534b50101975f742117477c92490e
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Tue May 20 11:03:33 2008 +0200

man pages: Add documentation for new cluster parameters.

Karolin
(cherry picked from commit 029875d8c9b2f9448f5299faaa3a48e8bccbca53)

commit 16adac4ea96e2234fd1253d0b866b0654bed9f8e
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Sun May 4 06:48:31 2008 +0200

Developer's Guide: Fix typos.

Karolin
(cherry picked from commit e206ffb8562c82173c9b426d76e49986fefe)

---

Summary of changes:
 docs-xml/Samba3-Developers-Guide/vfs.xml  |4 ++--
 docs-xml/smbdotconf/misc/clusteraddresses.xml |   17 +
 docs-xml/smbdotconf/misc/clustering.xml   |   17 +
 docs-xml/smbdotconf/misc/ctdbdsocket.xml  |   16 
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/clusteraddresses.xml
 create mode 100644 docs-xml/smbdotconf/misc/clustering.xml
 create mode 100644 docs-xml/smbdotconf/misc/ctdbdsocket.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-Developers-Guide/vfs.xml 
b/docs-xml/Samba3-Developers-Guide/vfs.xml
index 44e0bd6..96d512c 100644
--- a/docs-xml/Samba3-Developers-Guide/vfs.xml
+++ b/docs-xml/Samba3-Developers-Guide/vfs.xml
@@ -553,7 +553,7 @@ you can set this function pointer to NULL./para/listitem
 titleUpgrading to the New VFS Interface/title
 
 sect2
-titleUpgrading from 2.2.* and 3.0aplha modules/title
+titleUpgrading from 2.2.* and 3.0alpha modules/title
 
 orderedlist
 listitempara
@@ -833,7 +833,7 @@ static int example_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
 /para/listitem
 
 listitempara
-To make it easy to build 3rd party modules it would be usefull to provide
+To make it easy to build 3rd party modules it would be useful to provide
 configure.in, (configure), install.sh and Makefile.in with the module.
 (Take a look at the example in filenameexamples/VFS/filename.)
 /para
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml 
b/docs-xml/smbdotconf/misc/clusteraddresses.xml
new file mode 100644
index 000..d34d550
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -0,0 +1,17 @@
+samba:parameter name=cluster addresses
+context=G
+type=list
+developer=1
+xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraWith this parameter you can add additional addresses
+   nmbd will register with a WINS server. These addresses are not
+   necessarily present on all nodes simultaneously, but they will
+   be registered with the WINS server so that clients can contact
+   any of the nodes.
+   /para
+/description
+
+value type=default/value
+value type=example10.0.0.1 10.0.0.2 10.0.0.3/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/clustering.xml 
b/docs-xml/smbdotconf/misc/clustering.xml
new file mode 100644
index 000..b85934e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -0,0 +1,17 @@
+samba:parameter name=clustering
+ context=G
+type=boolean
+ advanced=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraThis parameter specifies whether Samba should contact
+   ctdb for accessing its tdb files and use ctdb as a backend
+   for its messaging backend.
+   /para
+
+   paraSet this parameter to value type=exampleyes/value only if
+   you have a cluster setup with ctdb running.
+   /para
+/description
+value type=defaultno/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml 
b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
new file mode 100644
index 000..a478553
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -0,0 +1,16 @@
+samba:parameter name=ctdbd socket
+ context=G
+ advanced=1
+type=string
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+synonymdefault/synonym
+description
+   paraIf you set value type=exampleclustering=yes/value,
+   you need to tell Samba where ctdbd listens on its unix domain
+   socket. The default path as of ctdb 1.0 is /tmp/ctdb.socket which
+   you have to explicitly set for Samba in smb.conf.
+   /para
+/description
+value type=default/value
+value type=example/tmp/ctdb.socket/value
+/samba:parameter

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2379-ga46ae502

The branch, v3-2-test has been updated
   via  a46ae502eacba4323a1cf6a57afed4a854634af1 (commit)
   via  86c4db49b91971a023907ce65e9764774fe5a0d5 (commit)
   via  1916bfa933d7979aefda1f29d469f6a694b91586 (commit)
   via  7bd026f44412024559f7573f48c9201c2d8c8a64 (commit)
   via  e2f73af845bdda822cffdcd5614fadf8d37cd8de (commit)
   via  6305d46c8a9262f5bcb9a2a0ac3599a915df27f4 (commit)
   via  824f590c7ebca0dcde8e57ff0ff4ef21cd7faa8f (commit)
   via  cece7ec384330bf3124723a3d25069d397e27795 (commit)
   via  22658feaf649d4a053ebe02c0f15c4fb4d83ce3b (commit)
   via  7b7ec7ab4153a306537bc98289d9d9a9ed63f87c (commit)
   via  cb7b3b5dfe2c240cdf2c0472f05cdd77b49a184b (commit)
   via  e87f4bf6c850c00cb480bb77b288427b8d4685a5 (commit)
  from  ab83cd9fc012689191d9a218be5c9f439fa560b5 (commit)

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


- Log -
commit a46ae502eacba4323a1cf6a57afed4a854634af1
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:44:46 2008 +0200

Revert Re-run make idl.

This reverts commit fe7203090c0c51e4561a3b5ce0d5d131d280ba8e.

commit 86c4db49b91971a023907ce65e9764774fe5a0d5
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:33:12 2008 +0200

Revert Re-run make idl.

This reverts commit 0d8181dab75887231a168f910203e53ec54fa4eb.

commit 1916bfa933d7979aefda1f29d469f6a694b91586
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:32:18 2008 +0200

Revert No need to compose CLI_SERVER_NAME_SLASH in net rpc service 
anymore.

This reverts commit b5291d477381521cd4b71674616f8c9899007002.

commit 7bd026f44412024559f7573f48c9201c2d8c8a64
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:32:05 2008 +0200

Revert Move svc_status_string() out of rpc_client/cli_svcctl.c

This reverts commit 2860ae2eb2cb99b4febb352f516b3fa9fbd2abbb.

commit e2f73af845bdda822cffdcd5614fadf8d37cd8de
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:29:42 2008 +0200

Revert Fix IDL for svcctl_EnumDependentServicesW().

This reverts commit 46bfded43dcabdd2302d82920fb2a37c41e58126.

commit 6305d46c8a9262f5bcb9a2a0ac3599a915df27f4
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:28:17 2008 +0200

Revert Re-run make idl.

This reverts commit f67632f9b24487bfaef9cc2ab932fda78b3c.

Conflicts:

source/librpc/gen_ndr/cli_ntsvcs.c

commit 824f590c7ebca0dcde8e57ff0ff4ef21cd7faa8f
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:25:56 2008 +0200

Revert Comment out some svcctl headers which are now defined in IDL.

This reverts commit 2201a8118c6abae3425dd5728af129bb8f71b564.

commit cece7ec384330bf3124723a3d25069d397e27795
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:25:30 2008 +0200

Revert Fill in IDL for PNP_GetDeviceRegProp.

This reverts commit b1b6e93aa1f1b6d80969b6e5dd8f723e21ae8ce8.

commit 22658feaf649d4a053ebe02c0f15c4fb4d83ce3b
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:24:58 2008 +0200

Revert Add svcctl_MgrAccessMask and svcctl_ServiceAccessMask.

This reverts commit eeb7c7d9d0c9f7ac171641bc8cafe20db704fdc4.

commit 7b7ec7ab4153a306537bc98289d9d9a9ed63f87c
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:23:13 2008 +0200

Revert Use pidl for _svcctl_EnumDependentServicesW().

This reverts commit 988291a9c07c055213f8979ebe75bb392811008d.

commit cb7b3b5dfe2c240cdf2c0472f05cdd77b49a184b
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:22:43 2008 +0200

Revert Remove unused marshalling for SVCCTL_ENUM_DEPENDENT_SERVICES.

This reverts commit 5838d81346a51ef1e996bab938533ae2097f7e47.

commit e87f4bf6c850c00cb480bb77b288427b8d4685a5
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 11:21:41 2008 +0200

Revert Add ntsvcs_getdevregprop command to rpcclient.

This reverts commit 4abe30fdae511422dccd04d0287d962192beadcb.

---

Summary of changes:
 source/include/rpc_ntsvcs.h|2 +
 source/include/rpc_secdes.h|   10 +--
 source/include/rpc_svcctl.h|   16 
 source/librpc/gen_ndr/cli_ntsvcs.c |   17 
 source/librpc/gen_ndr/cli_ntsvcs.h |7 --
 source/librpc/gen_ndr/cli_svcctl.c |   12 ++-
 source/librpc/gen_ndr/cli_svcctl.h |8 +-
 source/librpc/gen_ndr/ndr_ntsvcs.c |  153 
 source/librpc/gen_ndr/ndr_svcctl.c |  111 ++
 source/librpc/gen_ndr/ndr_svcctl.h |2 -
 source/librpc/gen_ndr/ntsvcs.h |   14 ---
 source/librpc/gen_ndr/srv_ntsvcs.c |   10 ---
 source/librpc/gen_ndr/srv_svcctl.c |2 +-
 source/librpc/gen_ndr/svcctl.h |   27 +--
 source/librpc/idl/ntsvcs.idl

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-102-gdfeeb74

The branch, v3-2-stable has been updated
   via  dfeeb74b00346aea16e69663fbc99f814e793229 (commit)
  from  ab07c252d73534b50101975f742117477c92490e (commit)

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


- Log -
commit dfeeb74b00346aea16e69663fbc99f814e793229
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Thu Mar 27 22:55:20 2008 +0100

Make sure to zero the returned handle in _svcctl_CloseServiceHandle().

Guenther
(cherry picked from commit 84a079af490cb135dd557091932ea079e1d7ff5b)

---

Summary of changes:
 source/rpc_server/srv_svcctl_nt.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_svcctl_nt.c 
b/source/rpc_server/srv_svcctl_nt.c
index 3962626..446fa4b 100644
--- a/source/rpc_server/srv_svcctl_nt.c
+++ b/source/rpc_server/srv_svcctl_nt.c
@@ -328,6 +328,8 @@ WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct 
svcctl_CloseServiceHan
if ( !close_policy_hnd( p, r-in.handle ) )
return  WERR_BADFID;
 
+   ZERO_STRUCTP(r-out.handle);
+
return WERR_OK;
 }
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1646-gf72dc52

The branch, v4-0-test has been updated
   via  f72dc52ccc426c8057b91b4699dfeda7d9e9b864 (commit)
  from  e360be0b99b638afdfa789e217bf08f99d09be7a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -
commit f72dc52ccc426c8057b91b4699dfeda7d9e9b864
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 12:59:04 2008 +0200

Change wks password in rpc-bench-schannel1

Prove that a workstation password change does not affect existing schannel
connections

---

Summary of changes:
 source/torture/rpc/schannel.c |   64 +
 1 files changed, 64 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/rpc/schannel.c b/source/torture/rpc/schannel.c
index f0279f0..a8f70b2 100644
--- a/source/torture/rpc/schannel.c
+++ b/source/torture/rpc/schannel.c
@@ -738,6 +738,70 @@ bool torture_rpc_schannel_bench1(struct torture_context 
*torture)
}
torture_assert_ntstatus_ok(torture, s-error, Failed establish a 
connect);
 
+   /*
+* Change the workstation password after establishing the netlogon
+* schannel connections to prove that existing connections are not
+* affected by a wks pwchange.
+*/
+
+   {
+   struct netr_ServerPasswordSet pwset;
+   char *password = generate_random_str(s-join_ctx1, 8);
+   struct creds_CredentialState *creds_state;
+   struct dcerpc_pipe *net_pipe;
+
+   status = dcerpc_pipe_connect_b(s, net_pipe, s-b,
+  ndr_table_netlogon,
+  s-wks_creds1,
+  torture-ev, torture-lp_ctx);
+
+   torture_assert_ntstatus_ok(torture, status,
+  dcerpc_pipe_connect_b failed);
+
+   pwset.in.server_name = talloc_asprintf(
+   net_pipe, %s, dcerpc_server_name(net_pipe));
+   pwset.in.computer_name =
+   cli_credentials_get_workstation(s-wks_creds1);
+   pwset.in.account_name = talloc_asprintf(
+   net_pipe, %s$, pwset.in.computer_name);
+   pwset.in.secure_channel_type = SEC_CHAN_WKSTA;
+   E_md4hash(password, pwset.in.new_password.hash);
+
+   creds_state = cli_credentials_get_netlogon_creds(
+   s-wks_creds1);
+   creds_des_encrypt(creds_state, pwset.in.new_password);
+   creds_client_authenticator(creds_state, pwset.in.credential);
+
+   status = dcerpc_netr_ServerPasswordSet(net_pipe, torture, 
pwset);
+   torture_assert_ntstatus_ok(torture, status,
+  ServerPasswordSet failed);
+
+   if (!creds_client_check(creds_state,
+   pwset.out.return_authenticator.cred)) {
+   printf(Credential chaining failed\n);
+   }
+
+   cli_credentials_set_password(s-wks_creds1, password,
+CRED_SPECIFIED);
+
+   talloc_free(net_pipe);
+
+   /* Just as a test, connect with the new creds */
+
+   talloc_free(s-wks_creds1-netlogon_creds);
+   s-wks_creds1-netlogon_creds = NULL;
+
+   status = dcerpc_pipe_connect_b(s, net_pipe, s-b,
+  ndr_table_netlogon,
+  s-wks_creds1,
+  torture-ev, torture-lp_ctx);
+
+   torture_assert_ntstatus_ok(torture, status,
+  dcerpc_pipe_connect_b failed);
+
+   talloc_free(net_pipe);
+   }
+
torture_comment(torture, Start looping LogonSamLogonEx on %d 
connections for %d secs\n,
s-nprocs, s-timelimit);
for (i=0; i  s-nprocs; i++) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-103-gca21a1e

The branch, v3-2-stable has been updated
   via  ca21a1e6eb297f65513139e201cbd212a0bd92d2 (commit)
  from  dfeeb74b00346aea16e69663fbc99f814e793229 (commit)

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


- Log -
commit ca21a1e6eb297f65513139e201cbd212a0bd92d2
Author: Jim McDonough [EMAIL PROTECTED]
Date:   Tue May 13 16:57:01 2008 -0400

Enable winbind child processes to do something with signals,
in particular closing and reopening logs on SIGHUP.

Conflicts:

source/winbindd/winbindd.c
(cherry picked from commit 36c51951c6bca7d9b56b02cd6469e9c5a1c5147f)

---

Summary of changes:
 source/winbindd/winbindd.c  |   35 +++
 source/winbindd/winbindd_dual.c |4 
 2 files changed, 27 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 1072f8e..57eee20 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -795,6 +795,27 @@ static bool remove_idle_client(void)
return False;
 }
 
+/* check if HUP has been received and reload files */
+void winbind_check_sighup(void)
+{
+   if (do_sighup) {
+
+   DEBUG(3, (got SIGHUP\n));
+
+   flush_caches();
+   reload_services_file();
+
+   do_sighup = False;
+   }
+}
+
+/* check if TERM has been received */
+void winbind_check_sigterm(void)
+{
+   if (do_sigterm)
+   terminate();
+}
+
 /* Process incoming clients on listen_sock.  We use a tricky non-blocking,
non-forking, non-threaded model which allows us to handle many
simultaneous connections while remaining impervious to many denial of
@@ -954,18 +975,8 @@ static void process_loop(void)
 
/* Check signal handling things */
 
-   if (do_sigterm)
-   terminate();
-
-   if (do_sighup) {
-
-   DEBUG(3, (got SIGHUP\n));
-
-   flush_caches();
-   reload_services_file();
-
-   do_sighup = False;
-   }
+   winbind_check_sigterm();
+   winbind_check_sighup();
 
if (do_sigusr2) {
print_winbindd_status();
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index 88121d2..d465801 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1105,6 +1105,10 @@ static bool fork_domain_child(struct winbindd_child 
*child)
struct timeval now;
TALLOC_CTX *frame = talloc_stackframe();
 
+   /* check for signals */
+   winbind_check_sigterm();
+   winbind_check_sighup();
+
run_events(winbind_event_context(), 0, NULL, NULL);
 
GetTimeOfDay(now);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2529-gf7d0903

2008-05-20 Thread Kai Blin

The branch, v3-3-test has been updated
   via  f7d0903a58b0b0fc248a613937a101f15baa5311 (commit)
   via  d26681b169a533f838f74d48af072b57afc9f8df (commit)
   via  2ee3d1aefab8dada5bd05a92b72776554617b7f9 (commit)
   via  25d4c6f692cf50d675a1de7c6eaeed271f349289 (commit)
   via  3f10527f79dddff703d31588cad3e9f37176565b (commit)
   via  0f5ebdf0bc5610bf93a4db67c9f9513683306c66 (commit)
   via  84a116be9c849900678e6e0a4b012e819e697c78 (commit)
   via  3ddd9c09e3b51df01ac34a9a1537e8954d2b1167 (commit)
   via  4ca08a5acc90c77d56f8f3e38443f23f43f034e8 (commit)
   via  d0237a736858a48494583ce7f960ea980768aa6c (commit)
   via  efc863e3758501a4c62dc9762eb0aded2dad01ff (commit)
   via  1813e545a99545575babe126386c8caca00aab8f (commit)
   via  a8b567aac3b0e39cfe67fb97167b10312ca5e73a (commit)
  from  48bf0b42a7d3829d476a50b4f6f80022279b4e49 (commit)

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


- Log -
commit f7d0903a58b0b0fc248a613937a101f15baa5311
Author: Kai Blin [EMAIL PROTECTED]
Date:   Thu May 15 10:14:41 2008 +0200

net: The top level help function for net cmd is always net_cmd_usage

commit d26681b169a533f838f74d48af072b57afc9f8df
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed May 14 15:09:29 2008 +0200

net: Move help for net status to net_status.c

commit 2ee3d1aefab8dada5bd05a92b72776554617b7f9
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed May 14 14:29:52 2008 +0200

net: Move printer help to net_rpc where it's used.

commit 25d4c6f692cf50d675a1de7c6eaeed271f349289
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed May 14 14:24:21 2008 +0200

net: Split out net share

commit 3f10527f79dddff703d31588cad3e9f37176565b
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed May 14 09:01:53 2008 +0200

net: Split out net afs

commit 0f5ebdf0bc5610bf93a4db67c9f9513683306c66
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue May 13 21:18:09 2008 +0200

net: Move more utility functions into net_util.c

commit 84a116be9c849900678e6e0a4b012e819e697c78
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue May 13 13:52:58 2008 +0200

net: Split out net file

commit 3ddd9c09e3b51df01ac34a9a1537e8954d2b1167
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue May 13 13:44:28 2008 +0200

net: Split out net group

commit 4ca08a5acc90c77d56f8f3e38443f23f43f034e8
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue May 13 12:51:09 2008 +0200

net: Split out net user

commit d0237a736858a48494583ce7f960ea980768aa6c
Author: Kai Blin [EMAIL PROTECTED]
Date:   Tue May 13 11:11:35 2008 +0200

net: Move net join handling into a separate file.

commit efc863e3758501a4c62dc9762eb0aded2dad01ff
Author: Kai Blin [EMAIL PROTECTED]
Date:   Mon May 12 14:38:21 2008 +0200

net: Split out common help functions.

commit 1813e545a99545575babe126386c8caca00aab8f
Author: Kai Blin [EMAIL PROTECTED]
Date:   Mon May 12 11:56:18 2008 +0200

net: more whitespace cleanup

commit a8b567aac3b0e39cfe67fb97167b10312ca5e73a
Author: Kai Blin [EMAIL PROTECTED]
Date:   Mon May 12 11:53:23 2008 +0200

net: Use true/false instead of True/False.

---

Summary of changes:
 source/Makefile.in  |   10 +-
 source/configure.in |3 +
 source/utils/net.c  |  610 +--
 source/utils/net.h  |1 +
 source/utils/net_ads.c  |   38 ++--
 source/utils/net_afs.c  |  101 +++
 source/utils/net_afs.h  |   29 ++
 source/utils/net_dom.c  |   20 +-
 source/utils/net_file.c |   57 
 source/utils/net_group.c|   65 
 source/utils/net_groupmap.c |   26 +-
 source/utils/net_help.c |  220 ++-
 source/utils/net_help_common.c  |   54 
 source/utils/net_help_common.h  |   49 +++
 source/utils/net_join.c |   54 
 source/utils/net_proto.h|  131 +
 source/utils/net_rap.c  |   18 +-
 source/utils/net_rpc.c  |  139 ++
 source/utils/net_rpc_join.c |2 +-
 source/utils/net_rpc_printer.c  |  148 +-
 source/utils/net_rpc_registry.c |8 +-
 source/utils/net_rpc_rights.c   |   10 +-
 source/utils/net_rpc_samsync.c  |   26 +-
 source/utils/net_rpc_shell.c|   18 +-
 source/utils/net_sam.c  |6 +-
 source/utils/net_share.c|   77 +
 source/utils/net_status.c   |   24 +-
 source/utils/net_user.c |   67 +
 source/utils/net_usershare.c|   18 +-
 source/utils/net_util.c |  468 ++-
 source/utils/netlookup.c|8 +-
 31 files changed, 1393 insertions(+), 1112 deletions(-)
 create mode 100644 source/utils/net_afs.c
 create mode 100644 source/utils/net_afs.h
 create mode 100644 source/utils/net_file.c
 create mode 100644 source/utils/net_group.c
 create mode

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2382-gf299316

The branch, v3-2-test has been updated
   via  f2993160a14ec286627af53b88d6fa535d8c9437 (commit)
   via  25220356f6998c514ca43ac21abdba67736ba166 (commit)
   via  988e0f47dcc7920696ceafc451405056ba424bfa (commit)
  from  a46ae502eacba4323a1cf6a57afed4a854634af1 (commit)

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


- Log -
commit f2993160a14ec286627af53b88d6fa535d8c9437
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 14:32:14 2008 +0200

Revert Actually connect to RPC.

This reverts commit 3082534454ff936ac0b78b5a2c72c9b060e21244.

Conflicts:

source/librpc/rpc/dcerpc.c
source/librpc/rpc/dcerpc.h
source/rpc_parse/parse_rpc.c

commit 25220356f6998c514ca43ac21abdba67736ba166
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 14:23:23 2008 +0200

Revert Reconcile ndr_syntax_id used by pidl-generated code and Samba3's 
RFC_IFACE.

This reverts commit 7bea00dca1ee08ef731dfa73110ef9c190a29919.

commit 988e0f47dcc7920696ceafc451405056ba424bfa
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 14:21:24 2008 +0200

Revert rpc_parse: Use UUIDs from librpc/gen_ndr/ when possible to reduce

This reverts commit 428654b473ba44b2f5340eefef0d4fcd51aff558.

---

Summary of changes:
 source/include/rpc_dce.h |9 +-
 source/rpc_client/cli_pipe.c |6 +-
 source/rpc_parse/parse_rpc.c |  226 ++---
 source/rpc_server/srv_pipe.c |8 +-
 4 files changed, 200 insertions(+), 49 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/rpc_dce.h b/source/include/rpc_dce.h
index 9b2044f..33ab365 100644
--- a/source/include/rpc_dce.h
+++ b/source/include/rpc_dce.h
@@ -157,7 +157,10 @@ enum schannel_direction {
 #define RPC_MAX_PDU_FRAG_LEN 0x10b8/* this is what w2k 
sets */
 
 /* RPC_IFACE */
-typedef struct ndr_syntax_id RPC_IFACE;
+typedef struct rpc_iface_info {
+   struct GUID uuid;  /* 16 bytes of rpc interface identification */
+   uint32 version;/* the interface version number */
+} RPC_IFACE;
 
 #define RPC_IFACE_LEN (UUID_SIZE + 4)
 
@@ -165,10 +168,10 @@ struct pipe_id_info {
/* the names appear not to matter: the syntaxes _do_ matter */
 
const char *client_pipe;
-   const RPC_IFACE *abstr_syntax; /* this one is the abstract syntax id */
+   RPC_IFACE abstr_syntax; /* this one is the abstract syntax id */
 
const char *server_pipe;  /* this one is the secondary syntax name */
-   const RPC_IFACE *trans_syntax; /* this one is the primary syntax id */
+   RPC_IFACE trans_syntax; /* this one is the primary syntax id */
 };
 
 /* RPC_HDR - dce rpc header */
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 2a2b547..71422cd 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -1656,8 +1656,8 @@ static bool valid_pipe_name(const int pipe_idx, RPC_IFACE 
*abstract, RPC_IFACE *
 
/* copy the required syntaxes out so we can do the right bind */

-   *transfer = *pipe_names[pipe_idx].trans_syntax;
-   *abstract = *pipe_names[pipe_idx].abstr_syntax;
+   *transfer = pipe_names[pipe_idx].trans_syntax;
+   *abstract = pipe_names[pipe_idx].abstr_syntax;
 
return True;
 }
@@ -1690,7 +1690,7 @@ static bool check_bind_response(RPC_HDR_BA *hdr_ba, const 
int pipe_idx, RPC_IFAC
 #endif /* JERRY */
 
/* check the transfer syntax */
-   if ((hdr_ba-transfer.if_version != transfer-if_version) ||
+   if ((hdr_ba-transfer.version != transfer-version) ||
 (memcmp(hdr_ba-transfer.uuid, transfer-uuid, 
sizeof(transfer-uuid)) !=0)) {
DEBUG(2,(bind_rpc_pipe: transfer syntax differs\n));
return False;
diff --git a/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c
index 3f89721..d4ab8f3 100644
--- a/source/rpc_parse/parse_rpc.c
+++ b/source/rpc_parse/parse_rpc.c
@@ -29,14 +29,176 @@
 interface/version dce/rpc pipe identification
 /
 
-const struct ndr_syntax_id syntax_spoolss = {
-   {
-   0x12345678, 0x1234, 0xabcd,
-   { 0xef, 0x00 },
-   { 0x01, 0x23,
- 0x45, 0x67, 0x89, 0xab }
-   }, 0x01
-};
+#define TRANS_SYNT_V2   \
+{   \
+   {   \
+   0x8a885d04, 0x1ceb, 0x11c9, \
+   { 0x9f, 0xe8 }, \
+   { 0x08, 0x00,   \
+ 0x2b, 0x10, 0x48, 0x60 }  \
+   }, 0x02 \
+}
+
+#define SYNT_NETLOGON_V2\
+{

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-104-gfd5a589

The branch, v3-2-stable has been updated
   via  fd5a58980d4fc2d0f9a8ba81a5ae9490e306b2ba (commit)
  from  ca21a1e6eb297f65513139e201cbd212a0bd92d2 (commit)

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


- Log -
commit fd5a58980d4fc2d0f9a8ba81a5ae9490e306b2ba
Author: Simo Sorce [EMAIL PROTECTED]
Date:   Fri Mar 7 11:33:26 2008 -0500

Enable use of Relocations Read-Only, if supported, for enhanced security.
(cherry picked from commit c20c5f082162ff6c0c2931f456897334aa002e83)

---

Summary of changes:
 source/Makefile.in  |4 ++--
 source/configure.in |   27 +++
 2 files changed, 29 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 95e96d5..71b2018 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -43,8 +43,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
 
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @LDFLAGS@
[EMAIL PROTECTED]@ @LDFLAGS@
[EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@
[EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@
 
 [EMAIL PROTECTED]@ @LDFLAGS@
 [EMAIL PROTECTED]@
diff --git a/source/configure.in b/source/configure.in
index ef39d6b..9e17fd1 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -73,6 +73,7 @@ AC_SUBST(HOST_OS)
 AC_SUBST(PICFLAG)
 AC_SUBST(PIE_CFLAGS)
 AC_SUBST(PIE_LDFLAGS)
+AC_SUBST(RELRO_LDFLAGS)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(INSTALLLIBCMD_SH)
 AC_SUBST(INSTALLLIBCMD_A)
@@ -1524,6 +1525,32 @@ EOF
fi
 fi
 
+# Set defaults
+RELRO_LDFLAGS=
+AC_ARG_ENABLE(relro, [AS_HELP_STRING([--enable-relro], [Turn on Relocations 
Read-Only (relro) support if available (default=yes)])])
+
+if test x$enable_relro != xno
+then
+   AC_CACHE_CHECK([for -Wl,-z,relro], samba_cv_relro,
+   [
+   cat  conftest.c EOF
+int foo;
+main () { return 0;}
+EOF
+   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS 
-Wl,-z,relro -o conftest conftest.c 1AS_MESSAGE_LOG_FD])
+   then
+   samba_cv_relro=yes
+   else
+   samba_cv_relro=no
+   fi
+   rm -f conftest*
+   ])
+   if test x${samba_cv_relro} = xyes
+   then
+   RELRO_LDFLAGS=-Wl,-z,relro
+   fi
+fi
+
 # Assume non-shared by default and override below
 BLDSHARED=false
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2383-gfb0a25d

The branch, v3-2-test has been updated
   via  fb0a25d59ddd28ea1d5af33ec7d9f817fac3fb9d (commit)
  from  f2993160a14ec286627af53b88d6fa535d8c9437 (commit)

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


- Log -
commit fb0a25d59ddd28ea1d5af33ec7d9f817fac3fb9d
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 17:29:40 2008 +0200

Fix a valgrind error in _samr_LookupNames

---

Summary of changes:
 source/rpc_server/srv_samr_nt.c |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index f28c771..42431bd 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1786,8 +1786,8 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
   struct samr_LookupNames *r)
 {
NTSTATUS status;
-   uint32 rid[MAX_SAM_ENTRIES];
-   enum lsa_SidType type[MAX_SAM_ENTRIES];
+   uint32 *rid;
+   enum lsa_SidType *type;
int i;
int num_rids = r-in.num_names;
DOM_SID pol_sid;
@@ -1796,9 +1796,6 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
 
DEBUG(5,(_samr_LookupNames: %d\n, __LINE__));
 
-   ZERO_ARRAY(rid);
-   ZERO_ARRAY(type);
-
if (!get_lsa_policy_samr_sid(p, r-in.domain_handle, pol_sid, 
acc_granted, NULL)) {
return NT_STATUS_OBJECT_TYPE_MISMATCH;
}
@@ -1815,6 +1812,12 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
DEBUG(5,(_samr_LookupNames: truncating entries to %d\n, 
num_rids));
}
 
+   rid = talloc_array(p-mem_ctx, uint32, num_rids);
+   NT_STATUS_HAVE_NO_MEMORY(rid);
+
+   type = talloc_array(p-mem_ctx, enum lsa_SidType, num_rids);
+   NT_STATUS_HAVE_NO_MEMORY(rid);
+
DEBUG(5,(_samr_LookupNames: looking name on SID %s\n,
 sid_string_dbg(pol_sid)));
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2384-gd3dd7ea

The branch, v3-2-test has been updated
   via  d3dd7ea5a77414c0d802668ab5bfbe3487b66926 (commit)
  from  fb0a25d59ddd28ea1d5af33ec7d9f817fac3fb9d (commit)

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


- Log -
commit d3dd7ea5a77414c0d802668ab5bfbe3487b66926
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 17:48:39 2008 +0200

Fix typo.

Guenther

---

Summary of changes:
 source/rpc_server/srv_samr_nt.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 42431bd..a89e00f 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1816,7 +1816,7 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
NT_STATUS_HAVE_NO_MEMORY(rid);
 
type = talloc_array(p-mem_ctx, enum lsa_SidType, num_rids);
-   NT_STATUS_HAVE_NO_MEMORY(rid);
+   NT_STATUS_HAVE_NO_MEMORY(type);
 
DEBUG(5,(_samr_LookupNames: looking name on SID %s\n,
 sid_string_dbg(pol_sid)));


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2531-g68d6b00

The branch, v3-3-test has been updated
   via  68d6b0053f3ce63747bc26a2bebb1fb0b46c8ca0 (commit)
   via  89f87efa2394e99802ca23307e712fc5820a5fc6 (commit)
  from  f7d0903a58b0b0fc248a613937a101f15baa5311 (commit)

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


- Log -
commit 68d6b0053f3ce63747bc26a2bebb1fb0b46c8ca0
Author: GÃ¼nther Deschner [EMAIL PROTECTED]
Date:   Tue May 20 17:48:39 2008 +0200

Fix typo.

Guenther
(cherry picked from commit d3dd7ea5a77414c0d802668ab5bfbe3487b66926)

commit 89f87efa2394e99802ca23307e712fc5820a5fc6
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 17:29:40 2008 +0200

Fix a valgrind error in _samr_LookupNames
(cherry picked from commit fb0a25d59ddd28ea1d5af33ec7d9f817fac3fb9d)

---

Summary of changes:
 source/rpc_server/srv_samr_nt.c |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index f28c771..a89e00f 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1786,8 +1786,8 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
   struct samr_LookupNames *r)
 {
NTSTATUS status;
-   uint32 rid[MAX_SAM_ENTRIES];
-   enum lsa_SidType type[MAX_SAM_ENTRIES];
+   uint32 *rid;
+   enum lsa_SidType *type;
int i;
int num_rids = r-in.num_names;
DOM_SID pol_sid;
@@ -1796,9 +1796,6 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
 
DEBUG(5,(_samr_LookupNames: %d\n, __LINE__));
 
-   ZERO_ARRAY(rid);
-   ZERO_ARRAY(type);
-
if (!get_lsa_policy_samr_sid(p, r-in.domain_handle, pol_sid, 
acc_granted, NULL)) {
return NT_STATUS_OBJECT_TYPE_MISMATCH;
}
@@ -1815,6 +1812,12 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
DEBUG(5,(_samr_LookupNames: truncating entries to %d\n, 
num_rids));
}
 
+   rid = talloc_array(p-mem_ctx, uint32, num_rids);
+   NT_STATUS_HAVE_NO_MEMORY(rid);
+
+   type = talloc_array(p-mem_ctx, enum lsa_SidType, num_rids);
+   NT_STATUS_HAVE_NO_MEMORY(type);
+
DEBUG(5,(_samr_LookupNames: looking name on SID %s\n,
 sid_string_dbg(pol_sid)));
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2532-gf845dbb

The branch, v3-3-test has been updated
   via  f845dbbceeff032cd248117ddf63af3d3736b21c (commit)
  from  68d6b0053f3ce63747bc26a2bebb1fb0b46c8ca0 (commit)

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


- Log -
commit f845dbbceeff032cd248117ddf63af3d3736b21c
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 18:35:23 2008 +0200

Fix memcache_flush()

I have no idea what I've been smoking when I checked this in :-(

Karolin, this fixes the join bug 3.0.28-3.2.0rc1

Thanks,

Volker

---

Summary of changes:
 source/lib/memcache.c |   39 ++-
 1 files changed, 34 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/memcache.c b/source/lib/memcache.c
index 6dee61a..e1426bc 100644
--- a/source/lib/memcache.c
+++ b/source/lib/memcache.c
@@ -120,11 +120,11 @@ static int memcache_compare(struct memcache_element *e, 
enum memcache_number n,
 {
DATA_BLOB this_key, this_value;
 
-   if ((int)e-n  (int)n) return -1;
-   if ((int)e-n  (int)n) return 1;
+   if ((int)e-n  (int)n) return 1;
+   if ((int)e-n  (int)n) return -1;
 
-   if (e-keylength  key.length) return -1;
-   if (e-keylength  key.length) return 1;
+   if (e-keylength  key.length) return 1;
+   if (e-keylength  key.length) return -1;
 
memcache_element_parse(e, this_key, this_value);
return memcmp(this_key.data, key.data, key.length);
@@ -357,10 +357,18 @@ void memcache_flush(struct memcache *cache, enum 
memcache_number n)
return;
}
 
+   /*
+* First, find *any* element of number n
+*/
+
while (true) {
struct memcache_element *elem = memcache_node2elem(node);
struct rb_node *next;
 
+   if ((int)elem-n == (int)n) {
+   break;
+   }
+
if ((int)elem-n  (int)n) {
next = node-rb_right;
}
@@ -373,15 +381,36 @@ void memcache_flush(struct memcache *cache, enum 
memcache_number n)
node = next;
}
 
-   node = rb_next(node);
if (node == NULL) {
return;
}
 
+   /*
+* Then, find the leftmost element with number n
+*/
+
+   while (true) {
+   struct rb_node *prev = rb_prev(node);
+   struct memcache_element *elem;
+
+   if (prev == NULL) {
+   break;
+   }
+   elem = memcache_node2elem(prev);
+   if ((int)elem-n != (int)n) {
+   break;
+   }
+   node = prev;
+   }
+
while (node != NULL) {
struct memcache_element *e = memcache_node2elem(node);
struct rb_node *next = rb_next(node);
 
+   if (e-n != n) {
+   break;
+   }
+
memcache_delete_element(cache, e);
node = next;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2385-g006e45f

The branch, v3-2-test has been updated
   via  006e45fba01e05c664359e8104d495609d9555f7 (commit)
  from  d3dd7ea5a77414c0d802668ab5bfbe3487b66926 (commit)

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


- Log -
commit 006e45fba01e05c664359e8104d495609d9555f7
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 18:35:23 2008 +0200

Fix memcache_flush()

I have no idea what I've been smoking when I checked this in :-(

Karolin, this fixes the join bug 3.0.28-3.2.0rc1

Please merge!

Thanks,

Volker

---

Summary of changes:
 source/lib/memcache.c |   39 ++-
 1 files changed, 34 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/memcache.c b/source/lib/memcache.c
index 6dee61a..e1426bc 100644
--- a/source/lib/memcache.c
+++ b/source/lib/memcache.c
@@ -120,11 +120,11 @@ static int memcache_compare(struct memcache_element *e, 
enum memcache_number n,
 {
DATA_BLOB this_key, this_value;
 
-   if ((int)e-n  (int)n) return -1;
-   if ((int)e-n  (int)n) return 1;
+   if ((int)e-n  (int)n) return 1;
+   if ((int)e-n  (int)n) return -1;
 
-   if (e-keylength  key.length) return -1;
-   if (e-keylength  key.length) return 1;
+   if (e-keylength  key.length) return 1;
+   if (e-keylength  key.length) return -1;
 
memcache_element_parse(e, this_key, this_value);
return memcmp(this_key.data, key.data, key.length);
@@ -357,10 +357,18 @@ void memcache_flush(struct memcache *cache, enum 
memcache_number n)
return;
}
 
+   /*
+* First, find *any* element of number n
+*/
+
while (true) {
struct memcache_element *elem = memcache_node2elem(node);
struct rb_node *next;
 
+   if ((int)elem-n == (int)n) {
+   break;
+   }
+
if ((int)elem-n  (int)n) {
next = node-rb_right;
}
@@ -373,15 +381,36 @@ void memcache_flush(struct memcache *cache, enum 
memcache_number n)
node = next;
}
 
-   node = rb_next(node);
if (node == NULL) {
return;
}
 
+   /*
+* Then, find the leftmost element with number n
+*/
+
+   while (true) {
+   struct rb_node *prev = rb_prev(node);
+   struct memcache_element *elem;
+
+   if (prev == NULL) {
+   break;
+   }
+   elem = memcache_node2elem(prev);
+   if ((int)elem-n != (int)n) {
+   break;
+   }
+   node = prev;
+   }
+
while (node != NULL) {
struct memcache_element *e = memcache_node2elem(node);
struct rb_node *next = rb_next(node);
 
+   if (e-n != n) {
+   break;
+   }
+
memcache_delete_element(cache, e);
node = next;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1647-gea3f4b9

2008-05-20 Thread James Peach

The branch, v4-0-test has been updated
   via  ea3f4b93057e85c4ea516cc77dd0f293016d520c (commit)
  from  f72dc52ccc426c8057b91b4699dfeda7d9e9b864 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -
commit ea3f4b93057e85c4ea516cc77dd0f293016d520c
Author: James Peach [EMAIL PROTECTED]
Date:   Tue May 20 10:54:45 2008 -0700

smbtorture: Add RAW-BENCH-TCON benchmark.

Add a simple test to benchmark the rate at which a server can accept
new tree connections. You can tune the length of time to run the
benchmark for and the number of parallel connections to make.

---

Summary of changes:
 source/lib/util/time.c|2 +-
 source/lib/util/time.h|2 +-
 source/torture/config.mk  |1 +
 source/torture/raw/raw.c  |2 +
 source/torture/raw/tconrate.c |  201 +
 5 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 source/torture/raw/tconrate.c


Changeset truncated at 500 lines:

diff --git a/source/lib/util/time.c b/source/lib/util/time.c
index a181885..978d73c 100644
--- a/source/lib/util/time.c
+++ b/source/lib/util/time.c
@@ -376,7 +376,7 @@ _PUBLIC_ NTTIME pull_nttime(uint8_t *base, uint16_t offset)
 /**
   return (tv1 - tv2) in microseconds
 */
-_PUBLIC_ int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2)
+_PUBLIC_ int64_t usec_time_diff(const struct timeval *tv1, const struct 
timeval *tv2)
 {
int64_t sec_diff = tv1-tv_sec - tv2-tv_sec;
return (sec_diff * 100) + (int64_t)(tv1-tv_usec - tv2-tv_usec);
diff --git a/source/lib/util/time.h b/source/lib/util/time.h
index 1ab976c..e4008c5 100644
--- a/source/lib/util/time.h
+++ b/source/lib/util/time.h
@@ -127,7 +127,7 @@ _PUBLIC_ NTTIME nttime_from_string(const char *s);
 /**
   return (tv1 - tv2) in microseconds
 */
-_PUBLIC_ int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2);
+_PUBLIC_ int64_t usec_time_diff(const struct timeval *tv1, const struct 
timeval *tv2);
 
 /**
   return a zero timeval
diff --git a/source/torture/config.mk b/source/torture/config.mk
index e82cb45..2857b99 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -70,6 +70,7 @@ TORTURE_RAW_OBJ_FILES = $(addprefix $(torturesrcdir)/raw/, \
pingpong.o \
lockbench.o \
lookuprate.o \
+   tconrate.o \
openbench.o \
rename.o \
eas.o \
diff --git a/source/torture/raw/raw.c b/source/torture/raw/raw.c
index c613308..0a7fc3e 100644
--- a/source/torture/raw/raw.c
+++ b/source/torture/raw/raw.c
@@ -35,6 +35,8 @@ NTSTATUS torture_raw_init(void)
torture_suite_add_simple_test(suite, BENCH-OPEN, torture_bench_open);
torture_suite_add_simple_test(suite, BENCH-LOOKUP,
torture_bench_lookup);
+   torture_suite_add_simple_test(suite, BENCH-TCON,
+   torture_bench_treeconnect);
torture_suite_add_simple_test(suite, OFFLINE, torture_test_offline);
torture_suite_add_1smb_test(suite, QFSINFO, torture_raw_qfsinfo);
torture_suite_add_1smb_test(suite, QFILEINFO, torture_raw_qfileinfo);
diff --git a/source/torture/raw/tconrate.c b/source/torture/raw/tconrate.c
new file mode 100644
index 000..6f0ba0d
--- /dev/null
+++ b/source/torture/raw/tconrate.c
@@ -0,0 +1,201 @@
+/*
+   SMB tree connection rate test
+
+   Copyright (C) 2006-2007 James Peach
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include libcli/libcli.h
+#include libcli/resolve/resolve.h
+#include torture/smbtorture.h
+#include lib/cmdline/popt_common.h
+#include param/param.h
+
+#include system/filesys.h
+#include system/shmem.h
+
+#define TIME_LIMIT_SECS 30
+#define usec_to_sec(s) ((s) / 100)
+#define sec_to_usec(s) ((s) * 100)
+
+/* Map a shared memory buffer of at least nelem counters. */
+static void * map_count_buffer(unsigned nelem, size_t elemsz)
+{
+   void * buf;
+   size_t bufsz;
+   size_t pagesz = getpagesize();
+
+   bufsz = nelem * elemsz;
+   bufsz = (bufsz + pagesz) % pagesz; /* round up to pagesz */
+
+#ifdef MAP_ANON
+   /* BSD */
+   buf = mmap(NULL, bufsz,

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2533-g830337f

The branch, v3-3-test has been updated
   via  830337f054a6c0646d85df33d9958e99283e727a (commit)
  from  f845dbbceeff032cd248117ddf63af3d3736b21c (commit)

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


- Log -
commit 830337f054a6c0646d85df33d9958e99283e727a
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Tue May 20 12:09:48 2008 -0700

Fix bug #5477 - recvfile code was broken.
Jeremy.

---

Summary of changes:
 source/lib/recvfile.c |   10 ++
 source/smbd/process.c |   12 
 2 files changed, 14 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/recvfile.c b/source/lib/recvfile.c
index 6e20933..513742c 100644
--- a/source/lib/recvfile.c
+++ b/source/lib/recvfile.c
@@ -58,6 +58,11 @@ static ssize_t default_sys_recvfile(int fromfd,
size_t total_written = 0;
char *buffer = NULL;
 
+   DEBUG(10,(default_sys_recvfile: from = %d, to = %d, 
+   offset=%.0f, count = %lu\n,
+   fromfd, tofd, (double)offset,
+   (unsigned long)count));
+
if (count == 0) {
return 0;
}
@@ -143,6 +148,11 @@ ssize_t sys_recvfile(int fromfd,
static bool try_splice_call = true;
size_t total_written = 0;
 
+   DEBUG(10,(sys_recvfile: from = %d, to = %d, 
+   offset=%.0f, count = %lu\n,
+   fromfd, tofd, (double)offset,
+   (unsigned long)count));
+
if (count == 0) {
return 0;
}
diff --git a/source/smbd/process.c b/source/smbd/process.c
index ab737a8..c8ad19d 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -252,6 +252,8 @@ static NTSTATUS 
receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
timeout, toread);
 
if (!NT_STATUS_IS_OK(status)) {
+   DEBUG(10, (receive_smb_raw_talloc_partial_read: %s\n,
+  nt_errstr(status)));
return status;
}
}
@@ -282,14 +284,8 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX 
*mem_ctx, int fd,
smb_len_large(lenbuf)  min_recv_size  /* Could be a 
UNIX large writeX. */
!srv_is_signing_active()) {
 
-   status = receive_smb_raw_talloc_partial_read(
-   mem_ctx, lenbuf, fd, buffer, timeout, p_unread, len);
-
-   if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(10, (receive_smb_raw: %s\n,
-  nt_errstr(status)));
-   return status;
-   }
+   return receive_smb_raw_talloc_partial_read(
+   mem_ctx, lenbuf, fd, buffer, timeout, p_unread, plen);
}
 
if (!valid_packet_size(len)) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2386-g47eb2e8

The branch, v3-2-test has been updated
   via  47eb2e8fa858d9f12637eb9a10466271335f61aa (commit)
  from  006e45fba01e05c664359e8104d495609d9555f7 (commit)

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


- Log -
commit 47eb2e8fa858d9f12637eb9a10466271335f61aa
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Tue May 20 12:10:01 2008 -0700

Fix bug #5477 - recvfile code was broken.
Jeremy.

---

Summary of changes:
 source/lib/recvfile.c |   10 ++
 source/smbd/process.c |   12 
 2 files changed, 14 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/recvfile.c b/source/lib/recvfile.c
index 6e20933..513742c 100644
--- a/source/lib/recvfile.c
+++ b/source/lib/recvfile.c
@@ -58,6 +58,11 @@ static ssize_t default_sys_recvfile(int fromfd,
size_t total_written = 0;
char *buffer = NULL;
 
+   DEBUG(10,(default_sys_recvfile: from = %d, to = %d, 
+   offset=%.0f, count = %lu\n,
+   fromfd, tofd, (double)offset,
+   (unsigned long)count));
+
if (count == 0) {
return 0;
}
@@ -143,6 +148,11 @@ ssize_t sys_recvfile(int fromfd,
static bool try_splice_call = true;
size_t total_written = 0;
 
+   DEBUG(10,(sys_recvfile: from = %d, to = %d, 
+   offset=%.0f, count = %lu\n,
+   fromfd, tofd, (double)offset,
+   (unsigned long)count));
+
if (count == 0) {
return 0;
}
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 5946989..2fc88ca 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -252,6 +252,8 @@ static NTSTATUS 
receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
timeout, toread);
 
if (!NT_STATUS_IS_OK(status)) {
+   DEBUG(10, (receive_smb_raw_talloc_partial_read: %s\n,
+  nt_errstr(status)));
return status;
}
}
@@ -282,14 +284,8 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX 
*mem_ctx, int fd,
smb_len_large(lenbuf)  min_recv_size  /* Could be a 
UNIX large writeX. */
!srv_is_signing_active()) {
 
-   status = receive_smb_raw_talloc_partial_read(
-   mem_ctx, lenbuf, fd, buffer, timeout, p_unread, len);
-
-   if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(10, (receive_smb_raw: %s\n,
-  nt_errstr(status)));
-   return status;
-   }
+   return receive_smb_raw_talloc_partial_read(
+   mem_ctx, lenbuf, fd, buffer, timeout, p_unread, plen);
}
 
if (!valid_packet_size(len)) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2534-g80e700e

The branch, v3-3-test has been updated
   via  80e700e3bd73f2ffa38046bdcba7f532e25198ef (commit)
  from  830337f054a6c0646d85df33d9958e99283e727a (commit)

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


- Log -
commit 80e700e3bd73f2ffa38046bdcba7f532e25198ef
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 21:54:36 2008 +0200

Fix nesting tdb_traverse in a transaction

Calling tdb_traverse inside a transaction led to the transaction lock being
held indefinitely. This was caused by the tdb_transaction_lock/unlock inside
tdb_traverse: The transaction code holds the global lock at offset
TRANSACTION_LOCK. The call to tdb_transaction_lock does nothing because the
transaction_lock is already being held. tdb_transaction_unlock inside 
tdb_wrap
resets tdb-have_transaction_lock but does not release the kernel-level 
fcntl
lock. transaction_commit later on does not release that fcntl lock either,
because tdb-have_transaction_lock was already reset by tdb_transaction().

This patch does fix that problem for me. An alternative would be to make
tdb-have_transaction_lock a counter that can cope with proper nesting, 
maybe
in other places as well.

Volker

---

Summary of changes:
 source/lib/tdb/common/traverse.c |   11 ---
 1 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
index 07b0c23..5a31742 100644
--- a/source/lib/tdb/common/traverse.c
+++ b/source/lib/tdb/common/traverse.c
@@ -232,20 +232,25 @@ int tdb_traverse(struct tdb_context *tdb,
 {
struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
int ret;
+   int in_transaction = (tdb-transaction != NULL);
 
if (tdb-read_only || tdb-traverse_read) {
return tdb_traverse_read(tdb, fn, private_data);
}

-   if (tdb_transaction_lock(tdb, F_WRLCK)) {
-   return -1;
+   if (!in_transaction) {
+   if (tdb_transaction_lock(tdb, F_WRLCK)) {
+   return -1;
+   }
}
 
tdb-traverse_write++;
ret = tdb_traverse_internal(tdb, fn, private_data, tl);
tdb-traverse_write--;
 
-   tdb_transaction_unlock(tdb);
+   if (!in_transaction) {
+   tdb_transaction_unlock(tdb);
+   }
 
return ret;
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1184-ga39d9ab

2008-05-20 Thread Gerald Carter

The branch, v3-0-test has been updated
   via  a39d9ab9c68932c15f5b42d8539aab6dfbc4d57a (commit)
   via  41c56ceb7c7b378747c01ffb863cd718f38ea31e (commit)
  from  e3ecb1828791e3e142dd84d7248c4ae70afe5e0c (commit)

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


- Log -
commit a39d9ab9c68932c15f5b42d8539aab6dfbc4d57a
Author: Gerald W. Carter [EMAIL PROTECTED]
Date:   Tue May 20 11:45:54 2008 -0500

Set version to 3.0.29 for release

commit 41c56ceb7c7b378747c01ffb863cd718f38ea31e
Author: Gerald W. Carter [EMAIL PROTECTED]
Date:   Tue May 20 11:45:19 2008 -0500

Updating release notes for 3.0.29

---

Summary of changes:
 WHATSNEW.txt   |  138 ++--
 source/VERSION |6 +-
 2 files changed, 137 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 71d3c3a..cdb3703 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,12 +1,142 @@
===
+   Release Notes for Samba 3.0.29
+May 20, 2008
+   ===
+
+This is a bug fix release of the Samba 3.0 production series and is the
+version that servers should be run for for all current Samba 3.0 bug fixes.  
+
+Major bug fixes included in Samba 3.0.29 are:
+
+  o Problems following domain trusts on a Samba DC.
+  o SMB Signing errors.
+  o Interoperability issues with Windows 2008 domains.
+
+
+##
+Changes
+###
+
+Changes since 3.0.28a
+-
+
+o   Michael Adam [EMAIL PROTECTED]
+* Fix build for pam_smbpass.
+* Fix a crash in tdb_wrap_log().
+
+
+o   Jeremy Allison [EMAIL PROTECTED]
+* BUG 5267: Fix for nmbd termination problems when no interfaces 
+  found.
+* BUG 5326: OS/2 servers give strange high word replies for 
+  print jobs.
+* Remove MS-DFS check that required the target host be ourself.
+* BUG 5372: Fix high CPU usage of cupsd on large print servers
+  by using more efficient CUPS queries in smbd.
+* Rewrite integer wrap checks to deal with gcc 4.x optimizations.
+* BUG 5095: Fix the enforcement of the Manage Documents access right.
+* Don't free memory from getpass() in mount.cifs.
+* BUG 5460: Fix MS-DFS referral problem in server code.
+* Fix bug in Winbind that caused the parent to ignore dead children.
+* Fix compile warnings.
+
+
+o   Alexander Bokovoy [EMAIL PROTECTED]
+* Fix build for pam_smbpass.
+* Document build fixes.
+
+
+o   Kai Blin [EMAIL PROTECTED]
+* BUG 4235: Improve compliance to the Squid helper protocol.
+  Original patch from Pawel Worach [EMAIL PROTECTED].
+
+
+o   Gerald (Jerry) Carter [EMAIL PROTECTED]
+* BUG 5107: Fix handling of large DNS replies on AIX and Solaris.
+
+
+o   Glenn Curtis [EMAIL PROTECTED]
+* Prevent cycle in Wibind's list of children when reaping dead processes.
+
+
+o   Steven Danneman [EMAIL PROTECTED]
+* BUG 5419: Fix memory leak in ads_do_search_all_args() (merge from v3-2).
+
+
+o   Guenther Deschner [EMAIL PROTECTED]
+* Fix winbind NETLOGON credential chain on a samba dc for w2k8 trusts.
+* Fix client connections and negotiation with Windows 2008 DCs
+  in member server code.
+* Add NT_STATUS_DOWNGRADE_DETECTED error code (merge from v3-2).
+* BUG 5430: Fix pam_winbind.so on Solaris (requires -lsocket).
+* Re-add samr getdispinfoindex parsing which got lost in the glue commit.
+* BUG 5461: Implement a very basic _samr_GetDisplayEnumerationIndex().
+  Corrects interop problem between Citrix PM and a Samba DC.
+
+
+o   Bryan Kolodziej [EMAIL PROTECTED]
+* BUG 3840: Fix smbclient connecting to NetApp filers when using
+  whitespace in the user's password.
+
+
+o   Volker Lendecke [EMAIL PROTECTED]
+* BUG 4901: Fix behavior of ldap passwd sync = only.
+* BUG 5317: Fix debug output from domain_client_validate().
+* BUG 5338: Fix format string bug in rpcclient.
+* Ensure that wbinfo -a trusted\\user%password works correctly
+  on a Samba DC with trusts.
+* BUG 5336: Fix SetUsetrInfo(level 25) to update the pwdLastSet 
+  attribute.
+* BUG 5350: Fallback to anonymous sessions if not trust password
+  could be obtained on Samba DCs and member servers.
+* BUG 5366: Fix password chat on Sun OpenSolaris (Nevada).
+* Fix signing problem in the client with trans requests.
+
+
+o   BjÃ¶rn Jacke [EMAIL PROTECTED]
+* Fix alignment bug hitting Solaris with reset in zero vc activated.
+
+
+o   Jim McDonough [EMAIL PROTECTED]
+* Fix build with glibc 2.8.
+* Enable winbind child processes to do something with signals, in 
+  particular closing and reopening

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2537-geb28153

The branch, v3-3-test has been updated
   via  eb281532b1721ded39c39bb00c26202080dcd735 (commit)
   via  dbb4d8107a61051d8bcf6c4c69ee976efc50b961 (commit)
   via  6b189dabc562d86dcaa685419d0cb6ea276f100d (commit)
  from  80e700e3bd73f2ffa38046bdcba7f532e25198ef (commit)

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


- Log -
commit eb281532b1721ded39c39bb00c26202080dcd735
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 23:08:42 2008 +0200

Fix type error in debug message

commit dbb4d8107a61051d8bcf6c4c69ee976efc50b961
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 23:06:38 2008 +0200

Fix some signed/unsigned warnings

commit 6b189dabc562d86dcaa685419d0cb6ea276f100d
Author: Tim Prouty [EMAIL PROTECTED]
Date:   Tue Apr 29 14:36:24 2008 -0700

Cleanup size_t return values in callers of convert_string_allocate

This patch is the second iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.

---

Summary of changes:
 source/include/proto.h   |   33 +++--
 source/lib/charcnv.c |  267 ++
 source/lib/ms_fnmatch.c  |5 +-
 source/lib/smbldap.c |   27 +++-
 source/lib/util_reg_api.c|   36 +++--
 source/lib/util_str.c|   52 ---
 source/lib/util_unistr.c |   20 ++-
 source/libads/ldap.c |   63 ++---
 source/libads/ldap_printer.c |   19 ++-
 source/libgpo/gpext/registry.c   |   23 ++-
 source/libgpo/gpo_ini.c  |   12 +-
 source/librpc/ndr/ndr_string.c   |  157 ++--
 source/libsmb/clikrb5.c  |9 +-
 source/libsmb/clirap.c   |   14 +-
 source/libsmb/smbencrypt.c   |   12 +-
 source/modules/vfs_catia.c   |5 +-
 source/passdb/pdb_ldap.c |   78 +++---
 source/passdb/secrets.c  |9 +-
 source/printing/nt_printing.c|5 +-
 source/rpcclient/cmd_wkssvc.c|7 +-
 source/smbd/lanman.c |9 +-
 source/smbd/mangle_hash.c|   11 +-
 source/smbd/message.c|   13 +-
 source/smbd/negprot.c|5 +-
 source/smbd/sesssetup.c  |2 +-
 source/smbd/trans2.c |   24 ++-
 source/torture/t_push_ucs2.c |5 +-
 source/utils/ntlm_auth_diagnostics.c |5 +-
 source/web/statuspage.c  |3 +-
 source/web/swat.c|   14 +-
 30 files changed, 541 insertions(+), 403 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index bf6328d..a0354a3 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -366,9 +366,9 @@ size_t convert_string(charset_t from, charset_t to,
 bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
 void const *src, size_t srclen, void *dst,
 size_t *converted_size, bool allow_bad_conv);
-size_t convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
-void const *src, size_t srclen, void *dst,
-bool allow_bad_conv);
+bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
+  void const *src, size_t srclen, void *dst,
+  size_t *converted_size, bool allow_bad_conv);
 size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t 
destlen);
 char *strdup_upper(const char *s);
 char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);
@@ -379,16 +379,17 @@ size_t ucs2_align(const void *base_ptr, const void *p, 
int flags);
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags);
 size_t push_ascii_fstring(void *dest, const char *src);
 size_t push_ascii_nstring(void *dest, const char *src);
-size_t push_ascii_allocate(char **dest, const char *src);
+bool push_ascii_allocate(char **dest, const char *src, size_t *converted_size);
 size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t 
src_len, int flags);
 size_t pull_ascii_fstring(char *dest, const void *src);
 size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src);
 size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t 
dest_len, int flags);
-size_t push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
-size_t push_ucs2_allocate(smb_ucs2_t **dest, const char *src);
+bool push_ucs2_allocate(smb_ucs2_t **dest, const char *src,
+   size_t *converted_size);
 size_t push_utf8_fstring(void *dest, const char *src);
-size_t push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src);
-size_t

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2388-ga0e1d8a

The branch, v3-2-test has been updated
   via  a0e1d8ac4dd9121312fd66ecb2e2942513df5a4b (commit)
   via  fd0b60a9e000f969cf99a8d670080cc7a52d97d8 (commit)
  from  47eb2e8fa858d9f12637eb9a10466271335f61aa (commit)

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


- Log -
commit a0e1d8ac4dd9121312fd66ecb2e2942513df5a4b
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Tue May 20 14:18:58 2008 -0700

Convert in_transaction to a bool. Add the same fix Volker
used for tdb_traverse() to tdb_traverse_read().
Jeremy.

commit fd0b60a9e000f969cf99a8d670080cc7a52d97d8
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Tue May 20 21:54:36 2008 +0200

Fix nesting tdb_traverse in a transaction

Calling tdb_traverse inside a transaction led to the transaction lock being
held indefinitely. This was caused by the tdb_transaction_lock/unlock inside
tdb_traverse: The transaction code holds the global lock at offset
TRANSACTION_LOCK. The call to tdb_transaction_lock does nothing because the
transaction_lock is already being held. tdb_transaction_unlock inside 
tdb_wrap
resets tdb-have_transaction_lock but does not release the kernel-level 
fcntl
lock. transaction_commit later on does not release that fcntl lock either,
because tdb-have_transaction_lock was already reset by tdb_transaction().

This patch does fix that problem for me. An alternative would be to make
tdb-have_transaction_lock a counter that can cope with proper nesting, 
maybe
in other places as well.

Volker

---

Summary of changes:
 source/lib/tdb/common/traverse.c |   22 --
 1 files changed, 16 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
index 07b0c23..69c81e6 100644
--- a/source/lib/tdb/common/traverse.c
+++ b/source/lib/tdb/common/traverse.c
@@ -204,18 +204,23 @@ int tdb_traverse_read(struct tdb_context *tdb,
 {
struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
int ret;
+   bool in_transaction = (tdb-transaction != NULL);
 
/* we need to get a read lock on the transaction lock here to
   cope with the lock ordering semantics of solaris10 */
-   if (tdb_transaction_lock(tdb, F_RDLCK)) {
-   return -1;
+   if (!in_transaction) {
+   if (tdb_transaction_lock(tdb, F_RDLCK)) {
+   return -1;
+   }
}
 
tdb-traverse_read++;
ret = tdb_traverse_internal(tdb, fn, private_data, tl);
tdb-traverse_read--;
 
-   tdb_transaction_unlock(tdb);
+   if (!in_transaction) {
+   tdb_transaction_unlock(tdb);
+   }
 
return ret;
 }
@@ -232,20 +237,25 @@ int tdb_traverse(struct tdb_context *tdb,
 {
struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
int ret;
+   bool in_transaction = (tdb-transaction != NULL);
 
if (tdb-read_only || tdb-traverse_read) {
return tdb_traverse_read(tdb, fn, private_data);
}

-   if (tdb_transaction_lock(tdb, F_WRLCK)) {
-   return -1;
+   if (!in_transaction) {
+   if (tdb_transaction_lock(tdb, F_WRLCK)) {
+   return -1;
+   }
}
 
tdb-traverse_write++;
ret = tdb_traverse_internal(tdb, fn, private_data, tl);
tdb-traverse_write--;
 
-   tdb_transaction_unlock(tdb);
+   if (!in_transaction) {
+   tdb_transaction_unlock(tdb);
+   }
 
return ret;
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2538-gbda0f03

The branch, v3-3-test has been updated
   via  bda0f03fb3fa8a7b14d4f54bee7076d691cad44f (commit)
  from  eb281532b1721ded39c39bb00c26202080dcd735 (commit)

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


- Log -
commit bda0f03fb3fa8a7b14d4f54bee7076d691cad44f
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Tue May 20 14:18:58 2008 -0700

Convert in_transaction to a bool. Add the same fix Volker
used for tdb_traverse() to tdb_traverse_read().
Jeremy.

---

Summary of changes:
 source/lib/tdb/common/traverse.c |   13 +
 1 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
index 5a31742..69c81e6 100644
--- a/source/lib/tdb/common/traverse.c
+++ b/source/lib/tdb/common/traverse.c
@@ -204,18 +204,23 @@ int tdb_traverse_read(struct tdb_context *tdb,
 {
struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
int ret;
+   bool in_transaction = (tdb-transaction != NULL);
 
/* we need to get a read lock on the transaction lock here to
   cope with the lock ordering semantics of solaris10 */
-   if (tdb_transaction_lock(tdb, F_RDLCK)) {
-   return -1;
+   if (!in_transaction) {
+   if (tdb_transaction_lock(tdb, F_RDLCK)) {
+   return -1;
+   }
}
 
tdb-traverse_read++;
ret = tdb_traverse_internal(tdb, fn, private_data, tl);
tdb-traverse_read--;
 
-   tdb_transaction_unlock(tdb);
+   if (!in_transaction) {
+   tdb_transaction_unlock(tdb);
+   }
 
return ret;
 }
@@ -232,7 +237,7 @@ int tdb_traverse(struct tdb_context *tdb,
 {
struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
int ret;
-   int in_transaction = (tdb-transaction != NULL);
+   bool in_transaction = (tdb-transaction != NULL);
 
if (tdb-read_only || tdb-traverse_read) {
return tdb_traverse_read(tdb, fn, private_data);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1649-ge05ec30