[SCM] Samba Shared Repository - branch master updated - af1c802791e3c9f54220d8c80c3de79ef422d726

2008-10-02 Thread Volker Lendecke
The branch, master has been updated
   via  af1c802791e3c9f54220d8c80c3de79ef422d726 (commit)
  from  8641b54a736c5c924bf38cf4574d1f8e34d2d0cd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit af1c802791e3c9f54220d8c80c3de79ef422d726
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Thu Oct 2 08:09:25 2008 +0200

The IRIX compiler does not like embedded unnamed unions

---

Summary of changes:
 libcli/netlogon.c   |   83 +++--
 libcli/netlogon.h   |4 +-
 source3/libads/cldap.c  |2 +-
 source3/libsmb/clidgram.c   |4 +-
 source3/libsmb/dsgetdcname.c|   20 
 source4/cldap_server/netlogon.c |   80 
 source4/libnet/libnet_become_dc.c   |2 +-
 source4/libnet/libnet_site.c|5 +-
 source4/libnet/libnet_unbecome_dc.c |2 +-
 source4/nbt_server/dgram/netlogon.c |4 +-
 source4/nbt_server/irpc.c   |9 ++--
 source4/torture/ldap/cldap.c|   88 +-
 source4/torture/nbt/dgram.c |   42 
 source4/torture/rpc/dssync.c|6 +-
 14 files changed, 183 insertions(+), 168 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/netlogon.c b/libcli/netlogon.c
index 36d9e5f..acfce61 100644
--- a/libcli/netlogon.c
+++ b/libcli/netlogon.c
@@ -37,17 +37,17 @@ NTSTATUS push_netlogon_samlogon_response(DATA_BLOB *data, 
TALLOC_CTX *mem_ctx,
if (response-ntver == NETLOGON_NT_VERSION_1) {
ndr_err = ndr_push_struct_blob(data, mem_ctx,
   iconv_convenience,
-  response-nt4,
+  response-data.nt4,
   
(ndr_push_flags_fn_t)ndr_push_NETLOGON_SAM_LOGON_RESPONSE_NT40);
} else if (response-ntver  NETLOGON_NT_VERSION_5EX) {
ndr_err = ndr_push_struct_blob(data, mem_ctx,
   iconv_convenience,
-  response-nt5_ex,
+  response-data.nt5_ex,
   
(ndr_push_flags_fn_t)ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags);
} else if (response-ntver  NETLOGON_NT_VERSION_5) {
ndr_err = ndr_push_struct_blob(data, mem_ctx,
   iconv_convenience,
-  response-nt5,
+  response-data.nt5,
   
(ndr_push_flags_fn_t)ndr_push_NETLOGON_SAM_LOGON_RESPONSE);
} else {
DEBUG(0, (Asked to push unknown netlogon response type 
0x%02x\n, response-ntver));
@@ -86,11 +86,12 @@ NTSTATUS pull_netlogon_samlogon_response(DATA_BLOB *data, 
TALLOC_CTX *mem_ctx,
if (ntver == NETLOGON_NT_VERSION_1) {
ndr_err = ndr_pull_struct_blob_all(data, mem_ctx,
   iconv_convenience,
-  response-nt4,
+  response-data.nt4,
   
(ndr_pull_flags_fn_t)ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_NT40);
response-ntver = NETLOGON_NT_VERSION_1;
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)  DEBUGLEVEL = 10) {
-   NDR_PRINT_DEBUG(NETLOGON_SAM_LOGON_RESPONSE_NT40, 
response-nt4);
+   NDR_PRINT_DEBUG(NETLOGON_SAM_LOGON_RESPONSE_NT40,
+   response-data.nt4);
}
 
} else if (ntver  NETLOGON_NT_VERSION_5EX) {
@@ -99,7 +100,9 @@ NTSTATUS pull_netlogon_samlogon_response(DATA_BLOB *data, 
TALLOC_CTX *mem_ctx,
if (!ndr) {
return NT_STATUS_NO_MEMORY;
}
-   ndr_err = 
ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(ndr, 
NDR_SCALARS|NDR_BUFFERS, response-nt5_ex, ntver);
+   ndr_err = ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(
+   ndr, NDR_SCALARS|NDR_BUFFERS, response-data.nt5_ex,
+   ntver);
if (ndr-offset  ndr-data_size) {
ndr_err = ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
 not all bytes consumed 
ofs[%u] size[%u],
@@ -107,17 +110,19 @@ NTSTATUS pull_netlogon_samlogon_response(DATA_BLOB *data, 
TALLOC_CTX *mem_ctx,
}
response-ntver = NETLOGON_NT_VERSION_5EX;
if 

[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-381-gf5b7648

2008-10-02 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  f5b7648e6c1bffb9f28d94cbd5b1efffdd3a33f4 (commit)
   via  979a104ce34ca294e41185cfa572c0d89791944e (commit)
   via  5c75c5cc294be58a293073e4bb88733ad8b270d4 (commit)
  from  b311ded4ae326ed7d140d4e8a8a1c81994311e9f (commit)

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


- Log -
commit f5b7648e6c1bffb9f28d94cbd5b1efffdd3a33f4
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Oct 1 15:00:22 2008 -0700

Whitespace cleanup.
Jeremy.
(cherry picked from commit e782150175ff324b6e0ef1802a9e17f9a5aea560)

commit 979a104ce34ca294e41185cfa572c0d89791944e
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Oct 1 13:23:09 2008 -0700

Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev [EMAIL 
PROTECTED].
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the 
main
one is in conn_free_internal() and would not free all the private data 
entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've 
done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
(cherry picked from commit 737825183115732de1f1d6d2bd89ce6402a65b20)

commit 5c75c5cc294be58a293073e4bb88733ad8b270d4
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Oct 1 12:28:45 2008 -0700

Turn the socket connections into a refcounted list - in the common case 
there'll now only be one socket per smbd.
Changed the format of the wire data to (a) include a version number (V1) as 
the first element. (b) removed the
;) at the end an replaced it with a \n. Receiver can change back if 
needed, and now receiver can just log
as-is to a text file (making testing easier). Added my (C). Sorry Holger, 
but I've changed quite a bit now.
Jeremy.
(cherry picked from commit 9a90ceac52f8623dde2bf50e630b10aebbc0e28d)

---

Summary of changes:
 source/modules/vfs_smb_traffic_analyzer.c |  139 -
 source/printing/print_cups.c  |   32 
 source/smbd/conn.c|2 +-
 source/web/statuspage.c   |5 +-
 source/winbindd/winbindd_util.c   |3 +-
 5 files changed, 116 insertions(+), 65 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_smb_traffic_analyzer.c 
b/source/modules/vfs_smb_traffic_analyzer.c
index 3925424..ff61768 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -3,6 +3,7 @@
  * on the net.
  *
  * Copyright (C) Holger Hetterich, 2008
+ * Copyright (C) Jeremy Allison, 2008
  *
  * 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
@@ -21,12 +22,14 @@
 #include includes.h
 
 /* abstraction for the send_over_network function */
-#define UNIX_DOMAIN_SOCKET 1
-#define INTERNET_SOCKET 0
+
+enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
+
+#define LOCAL_PATHNAME /var/tmp/stadsocket
 
 static int vfs_smb_traffic_analyzer_debug_level = DBGC_VFS;
 
-static int smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
+static enum sock_type smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
 {
connection_struct *conn = handle-conn;
 const char *Mode;
@@ -41,28 +44,22 @@ static int smb_traffic_analyzer_connMode(vfs_handle_struct 
*handle)
 
 /* Connect to an internet socket */
 
-static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
+   const char *name, uint16_t port)
 {
/* Create a streaming Socket */
-   const char *Hostname;
int sockfd = -1;
-uint16_t port;
struct addrinfo hints;
struct addrinfo *ailist = NULL;
struct addrinfo *res = NULL;
-   connection_struct *conn = handle-conn;
int ret;
 
-   /* get port number, target system from the config parameters */
-   Hostname=lp_parm_const_string(SNUM(conn), smb_traffic_analyzer,
-   host, localhost);
-
   

[SCM] Samba Shared Repository - branch master updated - 3c9f3c32d1290b8e6c438a197602afe3e96ae828

2008-10-02 Thread Stefan Metzmacher
The branch, master has been updated
   via  3c9f3c32d1290b8e6c438a197602afe3e96ae828 (commit)
   via  1e24fd3ba20ace6e8f7e974dd7b7fc1738ade8be (commit)
   via  81b3358f2a61c38ddd9d10accea8a4fe432f3085 (commit)
   via  551bbd853c87002fe068b5fb2a044c424ab7e874 (commit)
   via  3ebf3f316b003000b77499f494cf4d017ef870ad (commit)
   via  8aff4430308b36ae1a1a6629d67bba87eebb0dde (commit)
   via  aec5a08774d312fad52b7dea37305f25af41e65f (commit)
   via  5fc7fb48a0d7da8c4d0eec580c37b8a503faecce (commit)
  from  af1c802791e3c9f54220d8c80c3de79ef422d726 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3c9f3c32d1290b8e6c438a197602afe3e96ae828
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:25:13 2008 +0200

s4:drsuapi.idl: fix some fields in drsuapi_DsRemoveDSServer()

metze

commit 1e24fd3ba20ace6e8f7e974dd7b7fc1738ade8be
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:20:10 2008 +0200

s4:rootdse: for now don't pass down controls for the rootdse search

metze

commit 81b3358f2a61c38ddd9d10accea8a4fe432f3085
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:22:33 2008 +0200

s4:partition: register DOMAIN_SCOPE and SEARCH_OPTIONS controls

metze

commit 551bbd853c87002fe068b5fb2a044c424ab7e874
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:11:14 2008 +0200

s4:partition: pass down the SEARCH_OPTIONS control as uncritical

metze

commit 3ebf3f316b003000b77499f494cf4d017ef870ad
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:05:02 2008 +0200

s4:linked_attributes: fix a crash bug when the definition of a target 
attribute is missing

Windows 2003 has a broken schema where the definition of msDS-IsDomainFor
is missing (which is supposed to be the backlink of the msDS-HasDomainNCs
attribute.

Our schema is extracted from windows 2003, so we have the problem.

As the NET-API-BECOME-DC test triggers this bug, windows 2003
seems to just skip creating a backlink.

metze

commit 8aff4430308b36ae1a1a6629d67bba87eebb0dde
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 02:44:25 2008 +0200

s4:kludge_acl: just fake support for the SD_FLAGS control

metze

commit aec5a08774d312fad52b7dea37305f25af41e65f
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 02:30:48 2008 +0200

s4:extended_dn: add support for GUID=..., SID=... or 
WKGUID=...,DC=... as basedn

We resolve them into the real basedn before do the real search.

metze

commit 5fc7fb48a0d7da8c4d0eec580c37b8a503faecce
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:23:21 2008 +0200

s4:lib/ldb: fix stupid SID=... dn parsing bugs

metze

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/extended_dn.c   |  399 +---
 source4/dsdb/samdb/ldb_modules/kludge_acl.c|   20 +
 source4/dsdb/samdb/ldb_modules/linked_attributes.c |   38 ++-
 source4/dsdb/samdb/ldb_modules/partition.c |   22 ++
 source4/dsdb/samdb/ldb_modules/rootdse.c   |2 +-
 source4/lib/ldb/common/ldb_dn.c|4 +-
 source4/libnet/libnet_unbecome_dc.c|7 +-
 source4/librpc/idl/drsuapi.idl |4 +-
 8 files changed, 438 insertions(+), 58 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c 
b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index e40190e..6a7ed4e 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -202,10 +202,14 @@ struct extended_context {
 
struct ldb_module *module;
struct ldb_request *req;
-
+   struct ldb_control *control;
+   struct ldb_dn *basedn;
+   char *wellknown_object;
+   bool inject;
bool remove_guid;
bool remove_sid;
int extended_type;
+   const char * const *cast_attrs;
 };
 
 static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
@@ -226,13 +230,15 @@ static int extended_callback(struct ldb_request *req, 
struct ldb_reply *ares)
 
switch (ares-type) {
case LDB_REPLY_ENTRY:
-   /* for each record returned post-process to add any derived
-  attributes that have been asked for */
-   ret = inject_extended_dn(ares-message, ac-module-ldb,
-ac-extended_type, ac-remove_guid,
-ac-remove_sid);
-   if (ret != LDB_SUCCESS) {
-   return ldb_module_done(ac-req, NULL, NULL, ret);
+   if (ac-inject) {
+   /* for each record returned 

[SCM] Samba Shared Repository - annotated tag release-3-3-0pre2 created - release-3-3-0pre2

2008-10-02 Thread Karolin Seeger
The annotated tag, release-3-3-0pre2 has been created
at  5a0543ad7939b04e2d9a4eb90fb22920a121c169 (tag)
   tagging  f5b7648e6c1bffb9f28d94cbd5b1efffdd3a33f4 (commit)
  replaces  release-3-3-0pre1
 tagged by  Karolin Seeger
on  Thu Oct 2 12:42:57 2008 +0200

- Log -
tag release-3-3-0pre2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.4-svn0 (GNU/Linux)

iD8DBQBI5KXfbzORW2Vot+oRAgjsAKC8XLHu+I8SBBHZ7RHk+1HDwNFFQgCeOhsQ
WFLC9eKxrF3dGgC/CGI4Z7I=
=2vvo
-END PGP SIGNATURE-

Andrew Bartlett (1):
  Skip strcmp() on 2 NULL pointers.

Andrew Tridgell (12):
  ldb: Fix permissions of group_mapping.ldb.
  fixed tsmsm_sendfile(). The logic was totally broken.
  fixed an errno handling bug that could lead to an infinite loop
  Avoid a race condition in glibc between AIO and setresuid().
  become root for AIO operations
  EINVAL is also a valid error return, meaning this filesystem
  Handle arbitrary new PAC types
  fixed segv on startup with trusted domains
  removed unused variables
  fixed a segfault on the ctdb destructor code
  fixed an (unlikely) memory leak
  re-added winbind:ignore domains patch

Ephi Dror (1):
  Correct the netsamlogon_clear_cached_user function.

Gerald (Jerry) Carter (7):
  Add workaround for docs build and dependency on parameters.all.xml
  winbindd: Add support for name aliasing.
  winbindd: Update the calls to ws_name_XX() to reflect API changes.
  idmap_hash: Add the idmap/nss-info provider from Likewise Open.
  * Allow an admin to define the uid attribute for a RFC2307
  idmap: Increment the interface number after Volker's rewrite.
  idmap_adex: Add new idmap plugin for support RFC2307 enabled AD forests.

Gerald W. Carter (7):
  idmap_ad: Fix a segfault when calling nss_get_info() with a NULL ads 
structure.
  Document how to enable the name aliasing support in Winbind.
  Document the new hash and adex idmap/nss_info plugins.
  idmap_adex: Fix the nss_info install link.
  idmap_hash: Fix the nss_info link during make install
  WHATSNEW: Add summary of the idmap_hash plugin and Winbind's name 
aliasing
  idmap: Fix typo is gid2sid() that was caching using 
idmap_cache_set_sid2uid()

Günther Deschner (208):
  WHATSNEW: add some new items.
  build: make sure to create CODEPAGEDIR and MODULESDIR.
  winbindd: fix invalid sid copy (hit when enumerating sibling domains).
  kerberos: move the KRB5_KEY* macros to header file.
  kerberos: add KRB5_KT_KEY abstraction macro.
  kerberos: use KRB5_KT_KEY macro where appropriate.
  kerberos: fix HAVE_KRB5 related build issue.
  net: use netapi for rpc_user_rename.
  netapi: add all USER_INFO structs to public header.
  netapi: fix ENCRYPTED_PWLEN in IDL.
  re-run make idl.
  netapi: add ENCRYPTED_PWLEN to public header.
  netapi: add more infolevels to NetUserSetInfo example.
  netapi: make set_user_info_USER_INFO_X a separate function.
  netapi: process level 1003 in construct_USER_INFO_X as well.
  netapi: support level 1003 in NetUserSetInfo.
  netapi: fix convert_USER_INFO_X_to_samr_user_info21.
  netapi: support level 1011 in NetUserSetInfo.
  netapi: support level 1009 in NetUserSetInfo.
  netapi: fix acct_flags handling in 
convert_USER_INFO_X_to_samr_user_info21.
  netapi: support level 1012 in NetUserSetInfo.
  netapi: support level 1006 in NetUserSetInfo.
  netapi: add usriX_profile/usriX_home_dir_drive/usriX_primary_group_id to 
USER_INFO_X in IDL.
  re-run make idl.
  netapi: support level 1052 in NetUserSetInfo.
  netapi: support level 1053 in NetUserSetInfo.
  netapi: support level 1051 in NetUserSetInfo.
  netapi: support level 1024 in NetUserSetInfo.
  netapi: support level 1014 in NetUserSetInfo.
  net: use netapi function to list users.
  net: use netapi function to set user password.
  netapi: add NetUserGetGroups to IDL.
  re-run make idl.
  netapi: add skeleton for NetUserGetGroups.
  netapi: fix NetUserSetInfo return code for currently unsupported levels.
  netapi: add NetUserGetGroups to public headers.
  netapi: add NetUserGetGroups example code.
  netapi: implement NetUserGetGroups_r.
  net: use netapi for net rpc user info to enumerate user group 
membership.
  net: now that net rpc user uses netapi calls exclusivly, net rpc shell 
needs
  netapi: fix IDL for USER_INFO_4.
  re-run make idl.
  netapi: fix public header for USER_INFO_4.
  netapi: display all available levels in NetUserGetInfo example.
  netapi: add samr_acb_flags_to_netapi_flags for NetUserEnum and 
NetUserGetInfo.
  netapi: always return correct account name in NetUserGetInfo/NetUserEnum.
  netapi: give more correct error code in NetUserGetInfo.
  netapi: add USER_PRIV_* 

svn commit: samba-web r1243 - in trunk: .

2008-10-02 Thread kseeger
Author: kseeger
Date: 2008-10-02 11:14:53 + (Thu, 02 Oct 2008)
New Revision: 1243

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1243

Log:
Announce Samba 3.3.0pre2
Karolin
Modified:
   trunk/index.html


Changeset:
Modified: trunk/index.html
===
--- trunk/index.html2008-09-24 23:44:46 UTC (rev 1242)
+++ trunk/index.html2008-10-02 11:14:53 UTC (rev 1243)
@@ -19,6 +19,34 @@
 
 h2Current Release/h2
 
+h42 October 2008/h4
+p class=headlineSamba 3.3.0pre2 Available for Download/p
+
+pSamba 3.3.0pre2 is now available for download.  This is a
+preview of the next upgrade production release version of Samba.
+It is intended for testing purposes only.  Please test and
+a href=https://bugzilla.samba.org/;report any bugs that you
+find/a.  Our plan is to move to the release candidate stage
+by the end of October. The final 3.3.0 release is planned for December 15.
+Please read the changes in the
+a href=/samba/ftp/pre/WHATSNEW-3-3-0pre2.txtRelease Notes/a
+for details on new features and difference in behavior from
+previous releases./p
+
+pThe a href=/samba/ftp/pre/samba-3.3.0pre2.tar.gzSamba 3.3.0pre2
+source code/a can be downloaded now.  The a
+href=/samba/ftp/pre/samba-3.3.0pre2.tar.ascGnuPG
+signature is for the for the emun/emcompressed tarball/a.
+If you prefer, the a
+href=/samba/ftp/pre/patch-3.3.0pre1-3.3.0pre2.diffs.gzpatch
+file against Samba 3.3.0pre1/a
+(a href=/samba/ftp/pre/patch-3.3.0pre1-3.3.0pre2.diffs.ascGnuPG
+signature/a) is also available for download.
+Please read these a href=/samba/download/instructions on
+how to verify the gpg signature/a.  Precompiled packages will
+be made available on a volunteer basis and can be found in the
+a href=/samba/ftp/Binary_Packages/Binary_Packages download 
area/a./p
+
 h4a name=latest18 September 2008/a/h4
 p class=headlineSamba 3.2.4 Available for Download/p
 



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

2008-10-02 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  21d8210724dea1ceb94081cfebef73639d6f3741 (commit)
  from  2a2bb6b0757b1f2a6199474f93ea8d598575d650 (commit)

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


- Log -
commit 21d8210724dea1ceb94081cfebef73639d6f3741
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Thu Oct 2 14:34:01 2008 +0200

WHATSNEW: Start WHATSNEW for 3.3.0rc1.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e6b2855..2a38eb5 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,9 +1,9 @@
-   =
-   Release Notes for Samba 3.3.0pre2
-   October 2, 2008
-   =
+   
+   Release Notes for Samba 3.3.0rc1
+   
+   
 
-This is the second preview release of Samba 3.3.0.  This is *not*
+This is the first release candidate of Samba 3.3.0.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
@@ -168,127 +168,10 @@ smb.conf changes
 winbind reconnect delayNew 30
 
 
-Changes since 3.3.0pre1:
+Changes since 3.3.0pre2:
 
 
 
-o   Michael Adam [EMAIL PROTECTED]
-
-* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
-* BUG 5507: Fix several issues in the RHEL SPEC file.
-
-o   Jeremy Allison [EMAIL PROTECTED]
-* BUG 5729: Explicitly allow -valid.
-* BUG 5737: Fix winbindd crash in an unusual failure mode.
-* BUG 5751: Fix showing of ACLs on DFS in (lib)smbclient.
-* BUG 5762: Fix opening of mangled directory name (resulted
-  'is a stream name').
-* BUG 5783: Fix FindFirst where search pattern == mangled filename.
-* BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file
-  disposition.
-* BUG 5797: Fix moving of readonly files.
-* Fix crashes when looking up a non-existant uid.
-* Fix getting/setting of NT ACLs on a file.
-* Add st_birthtime and friends for accurate create times on *BSD
-  and MacOSX).
-* Fix the wcache_invalidate_samlogon calls.
-* Clarify usage of force create mode.
-* Get smbd to look (read-only) into the winbindd cache for uid/gid -- sid
-  mappings.
-* Write times code update.
-* Add experimental version of VFS module acl_xattr.
-* Fix rename_open_files.
-* Make SMB traffic analyzer VFS module more efficient.
-
-
-o   Gerald W. Carter [EMAIL PROTECTED]
-* Fix segfault when calling nss_get_info() with a NULL ads structure.
-* Add support for name aliasing in Winbind.
-* Add the idmap/nss-info provider from Likewise Open.
-* Allow an admin to define the uid attribute for a RFC2307
-  user object in AD to be the username alias.
-* Add new idmap backend adex to support RFC2307 enabled AD forests.
-* Add new idmap backend hash.
-
-
-o   Steven Danneman [EMAIL PROTECTED]
-* Fix build warnings.
-* Cleanup of DC enumeration in get_dcs().
-
-
-o   Günther Deschner [EMAIL PROTECTED]
-* BUG 5710: Fix changing of machine account passwords.
-* BUG 5784: Fix pam_winbind build issue on Solaris.
-* Fix invalid sid copy (hit when enumerating sibling domains) in Winbind.
-* Fix double installation of cifs.upcall.
-* Add change-user-password command to wbinfo.
-* Fix segfault in _srvsvc_NetShareAdd.
-
-
-o   James Ding [EMAIL PROTECTED]
-* BUG 5736: Fix Winbind crash bug with trusted domains.
-
-
-o   Ephi Dror [EMAIL PROTECTED]
-* Correct the netsamlogon_clear_cached_user function.
-
-
-o   Holger Hetterich [EMAIL PROTECTED]
-* Add new VFS module to analyze SMB traffic to record write and read
-  operations on the Samba server.
-
-
-o   Jeff Layton [EMAIL PROTECTED]
-* Fix build warnings in cifs.upcall.
-
-
-o   Volker Lendecke [EMAIL PROTECTED]
-* BUG 5707: Do proper error handling if the socket is closed.
-* BUG 5778: Don't define 'strlcat' and 'strlcpy' if it's already defined.
-* Fix Coverity IDs 587 and 589.
-* Increase the default positive idmap cache time to a week.
-* Fix calculation of useable_space for trans2 and nttrans replies.
-* Add mapping of generic bits when setting an NFSv4 ACL.
-
-
-o   Stefan Metzmacher [EMAIL PROTECTED]
-* Some write time fixes.
-
-
-o   Karolin Seeger [EMAIL PROTECTED]
-* Add new parameter cups connection timeout.
-
-
-o   Simo 

[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre2-2-gdae10eb

2008-10-02 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  dae10eb02c4a9616728e9e456a47cd80367b72f0 (commit)
   via  a4c282694c3cf664a432f3687585419fac42f59a (commit)
  from  f5b7648e6c1bffb9f28d94cbd5b1efffdd3a33f4 (commit)

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


- Log -
commit dae10eb02c4a9616728e9e456a47cd80367b72f0
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Thu Oct 2 14:34:01 2008 +0200

WHATSNEW: Start WHATSNEW for 3.3.0rc1.

Karolin
(cherry picked from commit 21d8210724dea1ceb94081cfebef73639d6f3741)

commit a4c282694c3cf664a432f3687585419fac42f59a
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Thu Oct 2 14:32:05 2008 +0200

VERSION: Raise version number.

Karolin

---

Summary of changes:
 WHATSNEW.txt   |  129 +++-
 source/VERSION |4 +-
 2 files changed, 8 insertions(+), 125 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e6b2855..2a38eb5 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,9 +1,9 @@
-   =
-   Release Notes for Samba 3.3.0pre2
-   October 2, 2008
-   =
+   
+   Release Notes for Samba 3.3.0rc1
+   
+   
 
-This is the second preview release of Samba 3.3.0.  This is *not*
+This is the first release candidate of Samba 3.3.0.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
@@ -168,127 +168,10 @@ smb.conf changes
 winbind reconnect delayNew 30
 
 
-Changes since 3.3.0pre1:
+Changes since 3.3.0pre2:
 
 
 
-o   Michael Adam [EMAIL PROTECTED]
-
-* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
-* BUG 5507: Fix several issues in the RHEL SPEC file.
-
-o   Jeremy Allison [EMAIL PROTECTED]
-* BUG 5729: Explicitly allow -valid.
-* BUG 5737: Fix winbindd crash in an unusual failure mode.
-* BUG 5751: Fix showing of ACLs on DFS in (lib)smbclient.
-* BUG 5762: Fix opening of mangled directory name (resulted
-  'is a stream name').
-* BUG 5783: Fix FindFirst where search pattern == mangled filename.
-* BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file
-  disposition.
-* BUG 5797: Fix moving of readonly files.
-* Fix crashes when looking up a non-existant uid.
-* Fix getting/setting of NT ACLs on a file.
-* Add st_birthtime and friends for accurate create times on *BSD
-  and MacOSX).
-* Fix the wcache_invalidate_samlogon calls.
-* Clarify usage of force create mode.
-* Get smbd to look (read-only) into the winbindd cache for uid/gid -- sid
-  mappings.
-* Write times code update.
-* Add experimental version of VFS module acl_xattr.
-* Fix rename_open_files.
-* Make SMB traffic analyzer VFS module more efficient.
-
-
-o   Gerald W. Carter [EMAIL PROTECTED]
-* Fix segfault when calling nss_get_info() with a NULL ads structure.
-* Add support for name aliasing in Winbind.
-* Add the idmap/nss-info provider from Likewise Open.
-* Allow an admin to define the uid attribute for a RFC2307
-  user object in AD to be the username alias.
-* Add new idmap backend adex to support RFC2307 enabled AD forests.
-* Add new idmap backend hash.
-
-
-o   Steven Danneman [EMAIL PROTECTED]
-* Fix build warnings.
-* Cleanup of DC enumeration in get_dcs().
-
-
-o   Günther Deschner [EMAIL PROTECTED]
-* BUG 5710: Fix changing of machine account passwords.
-* BUG 5784: Fix pam_winbind build issue on Solaris.
-* Fix invalid sid copy (hit when enumerating sibling domains) in Winbind.
-* Fix double installation of cifs.upcall.
-* Add change-user-password command to wbinfo.
-* Fix segfault in _srvsvc_NetShareAdd.
-
-
-o   James Ding [EMAIL PROTECTED]
-* BUG 5736: Fix Winbind crash bug with trusted domains.
-
-
-o   Ephi Dror [EMAIL PROTECTED]
-* Correct the netsamlogon_clear_cached_user function.
-
-
-o   Holger Hetterich [EMAIL PROTECTED]
-* Add new VFS module to analyze SMB traffic to record write and read
-  operations on the Samba server.
-
-
-o   Jeff Layton [EMAIL PROTECTED]
-* Fix build warnings in cifs.upcall.
-
-
-o   Volker Lendecke [EMAIL PROTECTED]
-* BUG 5707: Do proper error handling if the socket is closed.
-* BUG 5778: Don't define 'strlcat' and 'strlcpy' if it's already defined.
-* Fix Coverity IDs 587 and 589.
-* Increase the default positive 

[SCM] Samba Shared Repository - branch master updated - f0c17496366547f14638763a6b8859c365f18792

2008-10-02 Thread Derrell Lipman
The branch, master has been updated
   via  f0c17496366547f14638763a6b8859c365f18792 (commit)
  from  3c9f3c32d1290b8e6c438a197602afe3e96ae828 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit f0c17496366547f14638763a6b8859c365f18792
Author: Derrell Lipman [EMAIL PROTECTED]
Date:   Thu Oct 2 09:03:32 2008 -0400

Fix bug 5805: don't close stdout

- When calling setup_logging multiple times, the code was closing the debug
  file descriptor before opening or assigning the new one.  We don't, 
however,
  want to close the debug file descriptor if it is stdout.

Derrell

---

Summary of changes:
 source3/lib/debug.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index d835ea7..d91b55d 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -578,7 +578,9 @@ void setup_logging(const char *pname, bool interactive)
stdout_logging = False;
if (dbf) {
x_fflush(dbf);
-   (void) x_fclose(dbf);
+if (dbf != x_stdout) {
+(void) x_fclose(dbf);
+}
}
 
dbf = NULL;


-- 
Samba Shared Repository


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

2008-10-02 Thread Derrell Lipman
The branch, v3-2-test has been updated
   via  7142872d2c6e0be42307671afa31016f6940007d (commit)
  from  d596f78517f33f5a4c4849be3162d4f3031f045f (commit)

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


- Log -
commit 7142872d2c6e0be42307671afa31016f6940007d
Author: Derrell Lipman [EMAIL PROTECTED]
Date:   Thu Oct 2 09:17:49 2008 -0400

Fix bug 5805: don't close stdout

- When calling setup_logging multiple times, the code was closing the debug
  file descriptor before opening or assigning the new one.  We don't, 
however,
  want to close the debug file descriptor if it is stdout.

Derrell

---

Summary of changes:
 source/lib/debug.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/debug.c b/source/lib/debug.c
index d835ea7..d91b55d 100644
--- a/source/lib/debug.c
+++ b/source/lib/debug.c
@@ -578,7 +578,9 @@ void setup_logging(const char *pname, bool interactive)
stdout_logging = False;
if (dbf) {
x_fflush(dbf);
-   (void) x_fclose(dbf);
+if (dbf != x_stdout) {
+(void) x_fclose(dbf);
+}
}
 
dbf = NULL;


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - a25fac13ebd6ffc1e5eac25182636cfa298435f4

2008-10-02 Thread Stefan Metzmacher
The branch, master has been updated
   via  a25fac13ebd6ffc1e5eac25182636cfa298435f4 (commit)
   via  05994005a35b940efc9cd8d1b3b0eebf2d2e38d7 (commit)
  from  f0c17496366547f14638763a6b8859c365f18792 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a25fac13ebd6ffc1e5eac25182636cfa298435f4
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 18:49:11 2008 +0200

s4:blackblox/test_ldb: test searches via wellknownObjects

metze

commit 05994005a35b940efc9cd8d1b3b0eebf2d2e38d7
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date:   Thu Oct 2 11:56:12 2008 +0200

s4:setup: add wellknownObjects to the domain object

metze

---

Summary of changes:
 source4/setup/provision_basedn_modify.ldif |8 
 testprogs/blackbox/test_ldb.sh |   62 
 2 files changed, 70 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/setup/provision_basedn_modify.ldif 
b/source4/setup/provision_basedn_modify.ldif
index 63332e9..a7b501e 100644
--- a/source4/setup/provision_basedn_modify.ldif
+++ b/source4/setup/provision_basedn_modify.ldif
@@ -77,4 +77,12 @@ subRefs: ${SCHEMADN}
 replace: gPLink
 gPLink: [LDAP://CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN};0]
 -
+replace: wellKnownObjects
+wellKnownObjects: 
B:32:22b70c67d56e4efb91e9300fca3dc1aa:CN=ForeignSecurityPrincipals,${DOMAINDN}
+wellKnownObjects: 
B:32:2fbac1870ade11d297c400c04fd8d5cd:CN=Infrastructure,${DOMAINDN}
+wellKnownObjects: B:32:ab1d30f3768811d1aded00c04fd8d5cd:CN=System,${DOMAINDN}
+wellKnownObjects: B:32:a361b2d211d1aa4b00c04fd7d83a:OU=Domain 
Controllers,${DOMAINDN}
+wellKnownObjects: 
B:32:aa312825768811d1aded00c04fd8d5cd:CN=Computers,${DOMAINDN}
+wellKnownObjects: B:32:a9d1ca15768811d1aded00c04fd8d5cd:CN=Users,${DOMAINDN}
+-
 ${DOMAINGUID_MOD}
diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh
index 8e1af99..7a657d2 100755
--- a/testprogs/blackbox/test_ldb.sh
+++ b/testprogs/blackbox/test_ldb.sh
@@ -117,5 +117,67 @@ echo Search Options Control Query test returned 0 items
 failed=`expr $failed + 1`
 fi
 
+function wellkown_object_test() {
+   local guid=$1
+   local object=$2
+   local basedns
+   local dn
+   local r
+   local c
+   local n
+   local failed=0
+
+   basedns=WKGUID=${guid},${BASEDN} wkGuId=${guid},${BASEDN}
+   for dn in ${basedns}; do
+   echo Test ${dn} = ${object}
+   r=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER 
'(objectClass=*)' -b ${dn} | grep 'dn: '`
+   n=`echo ${r} | grep 'dn: ' | wc -l`
+   c=`echo ${r} | grep ${object} | wc -l`
+
+   if [ $n -lt 1 ]; then
+   echo Object not found by WKGUID
+   failed=`expr $failed + 1`
+   continue
+   fi
+   if [ $c -lt 1 ]; then
+   echo Wrong object found by WKGUID: [${r}]
+   failed=`expr $failed + 1`
+   continue
+   fi
+   done
+
+   return $failed
+}
+
+wellkown_object_test 22B70C67D56E4EFB91E9300FCA3DC1AA ForeignSecurityPrincipals
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
+wellkown_object_test 2FBAC1870ADE11D297C400C04FD8D5CD Infrastructure
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
+wellkown_object_test AB1D30F3768811D1ADED00C04FD8D5CD System
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
+wellkown_object_test A361B2D211D1AA4B00C04FD7D83A Domain Controllers
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
+wellkown_object_test AA312825768811D1ADED00C04FD8D5CD Computers
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
+wellkown_object_test A9D1CA15768811D1ADED00C04FD8D5CD Users
+st=$?
+if [ x$st != x0 ]; then
+   failed=`expr $failed + $st`
+fi
 
 exit $failed


-- 
Samba Shared Repository


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

2008-10-02 Thread Jeremy Allison
The branch, v3-3-test has been updated
   via  475c9a7ff5a96f7d1392610066fdd1ae28b7e039 (commit)
  from  21d8210724dea1ceb94081cfebef73639d6f3741 (commit)

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


- Log -
commit 475c9a7ff5a96f7d1392610066fdd1ae28b7e039
Author: Derrell Lipman [EMAIL PROTECTED]
Date:   Thu Oct 2 10:40:08 2008 -0700

Fix bug 5805: don't close stdout

- When calling setup_logging multiple times, the code was closing the debug
file descriptor before opening or assigning the new one.  We don't, however,
want to close the debug file descriptor if it is stdout.

Derrell

---

Summary of changes:
 source/lib/debug.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/debug.c b/source/lib/debug.c
index d835ea7..d91b55d 100644
--- a/source/lib/debug.c
+++ b/source/lib/debug.c
@@ -578,7 +578,9 @@ void setup_logging(const char *pname, bool interactive)
stdout_logging = False;
if (dbf) {
x_fflush(dbf);
-   (void) x_fclose(dbf);
+if (dbf != x_stdout) {
+(void) x_fclose(dbf);
+}
}
 
dbf = NULL;


-- 
Samba Shared Repository


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

2008-10-02 Thread Jeremy Allison
The branch, v3-3-test has been updated
   via  89df6afb7a16feb1a0b186965ff37a1f8990bcca (commit)
  from  475c9a7ff5a96f7d1392610066fdd1ae28b7e039 (commit)

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


- Log -
commit 89df6afb7a16feb1a0b186965ff37a1f8990bcca
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Thu Oct 2 12:20:27 2008 -0700

Don't reject a successful alloc :-(.
Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index b46d83b..b9bed7a 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -71,7 +71,7 @@ static http_t *cups_connect(TALLOC_CTX *frame)
} else {
server = talloc_strdup(frame,cupsServer());
}
-   if (server) {
+   if (!server) {
return NULL;
}
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - e0dbac6873b816384f570ad8a7ceea7c96573d00

2008-10-02 Thread Jeremy Allison
The branch, master has been updated
   via  e0dbac6873b816384f570ad8a7ceea7c96573d00 (commit)
  from  a25fac13ebd6ffc1e5eac25182636cfa298435f4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e0dbac6873b816384f570ad8a7ceea7c96573d00
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Thu Oct 2 12:21:11 2008 -0700

Don't reject a successful alloc :-(.
Jeremy.

---

Summary of changes:
 source3/printing/print_cups.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index b46d83b..b9bed7a 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -71,7 +71,7 @@ static http_t *cups_connect(TALLOC_CTX *frame)
} else {
server = talloc_strdup(frame,cupsServer());
}
-   if (server) {
+   if (!server) {
return NULL;
}
 


-- 
Samba Shared Repository


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

2008-10-02 Thread Jeremy Allison
The branch, v3-2-test has been updated
   via  a1323951a3264f81be07276f021201bee0d8d0f5 (commit)
  from  7142872d2c6e0be42307671afa31016f6940007d (commit)

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


- Log -
commit a1323951a3264f81be07276f021201bee0d8d0f5
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Thu Oct 2 14:02:20 2008 -0700

Fix bug #5080. Access to cups-printers via samba broken with cups 1.3.4, 
Unsupported character set.
Cups 1.3.4 expects utf8 to be used in all messages to/from the server. We 
may be using a
different character set so we need to use talloc utf8 push/pull functions 
in all communication.
Contains the !server fix already applied to 3.3.
Jeremy.

---

Summary of changes:
 source/printing/print_cups.c |  282 ++
 1 files changed, 203 insertions(+), 79 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index 2acf2cb..0be65a5 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -2,6 +2,7 @@
  * Support code for the Common UNIX Printing System (CUPS)
  *
  * Copyright 1999-2003 by Michael R Sweet.
+ * Copyright 2008 Jeremy Allison.
  *
  * 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
@@ -17,6 +18,10 @@
  * along with this program; if not, see http://www.gnu.org/licenses/.
  */
 
+/*
+ * JRA. Converted to utf8 pull/push.
+ */
+
 #include includes.h
 #include printing.h
 
@@ -40,16 +45,21 @@ cups_passwd_cb(const char *prompt)  /* I - Prompt */
return (NULL);
 }
 
-static http_t *cups_connect(void)
+static http_t *cups_connect(TALLOC_CTX *frame)
 {
-   http_t *http;
-   char *server, *p;
+   http_t *http = NULL;
+   char *server = NULL, *p = NULL;
int port;
 
if (lp_cups_server() != NULL  strlen(lp_cups_server())  0) {
-   server = smb_xstrdup(lp_cups_server());
+   if (push_utf8_talloc(frame, server, lp_cups_server()) == 
(size_t)-1) {
+   return NULL;
+   }
} else {
-   server = smb_xstrdup(cupsServer());
+   server = talloc_strdup(frame,cupsServer());
+   }
+   if (!server) {
+   return NULL;
}
 
p = strchr(server, ':');
@@ -66,16 +76,15 @@ static http_t *cups_connect(void)
if ((http = httpConnect(server, port)) == NULL) {
DEBUG(0,(Unable to connect to CUPS server %s:%d - %s\n,
 server, port, strerror(errno)));
-   SAFE_FREE(server);
return NULL;
}
 
-   SAFE_FREE(server);
return http;
 }
 
 bool cups_cache_reload(void)
 {
+   TALLOC_CTX *frame = talloc_stackframe();
http_t  *http = NULL;   /* HTTP connection to server */
ipp_t   *request = NULL,/* IPP Request */
*response = NULL;   /* IPP Response */
@@ -102,7 +111,7 @@ bool cups_cache_reload(void)
* Try to connect to the server...
*/
 
-   if ((http = cups_connect()) == NULL) {
+   if ((http = cups_connect(frame)) == NULL) {
goto out;
}
 
@@ -123,7 +132,7 @@ bool cups_cache_reload(void)
language = cupsLangDefault();
 
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- attributes-charset, NULL, cupsLangEncoding(language));
+ attributes-charset, NULL, utf-8);
 
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
  attributes-natural-language, NULL, language-language);
@@ -163,12 +172,18 @@ bool cups_cache_reload(void)
 
while (attr != NULL  attr-group_tag == IPP_TAG_PRINTER) {
if (strcmp(attr-name, printer-name) == 0 
-   attr-value_tag == IPP_TAG_NAME)
-   name = attr-values[0].string.text;
+   attr-value_tag == IPP_TAG_NAME) {
+   pull_utf8_talloc(frame,
+   name,
+   attr-values[0].string.text);
+   }
 
if (strcmp(attr-name, printer-info) == 0 
-   attr-value_tag == IPP_TAG_TEXT)
-   info = attr-values[0].string.text;
+   attr-value_tag == IPP_TAG_TEXT) {
+   pull_utf8_talloc(frame,
+   info,
+   attr-values[0].string.text);
+   }
 
attr = 

[SCM] Samba Shared Repository - branch master updated - b174765d54c202eb507b1caaed95c33bcd54d243

2008-10-02 Thread Simo Sorce
The branch, master has been updated
   via  b174765d54c202eb507b1caaed95c33bcd54d243 (commit)
  from  e0dbac6873b816384f570ad8a7ceea7c96573d00 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b174765d54c202eb507b1caaed95c33bcd54d243
Author: Simo Sorce [EMAIL PROTECTED]
Date:   Thu Oct 2 17:15:00 2008 -0400

Fix crash bugs in error paths: ac is not yet initialized here, and we don't
need to call ldb_module_done in the main module functions, we can directly
return an error. ldb_module_done() is for callbacks

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/extended_dn.c |   45 ++---
 1 files changed, 18 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c 
b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 6a7ed4e..88a8887 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -426,16 +426,14 @@ static int extended_search(struct ldb_module *module, 
struct ldb_request *req)
DATA_BLOB binary;
binary = strhex_to_data_blob(str);
if (!binary.data) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, 
NULL,
-  
LDB_ERR_OPERATIONS_ERROR);
+   ldb_oom(module-ldb);
+   return LDB_ERR_OPERATIONS_ERROR;
}
valstr = ldb_binary_encode(req, binary);
data_blob_free(binary);
if (!valstr) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, 
NULL,
-  
LDB_ERR_OPERATIONS_ERROR);
+   ldb_oom(module-ldb);
+   return LDB_ERR_OPERATIONS_ERROR;
}
}
 
@@ -443,9 +441,8 @@ static int extended_search(struct ldb_module *module, 
struct ldb_request *req)
base_dn = ldb_get_default_basedn(module-ldb);
base_dn_filter = talloc_asprintf(req, (objectSid=%s), 
valstr);
if (!base_dn_filter) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, NULL,
-  
LDB_ERR_OPERATIONS_ERROR);
+   ldb_oom(module-ldb);
+   return LDB_ERR_OPERATIONS_ERROR;
}
base_dn_scope = LDB_SCOPE_SUBTREE;
base_dn_attrs = dnattr;
@@ -476,16 +473,14 @@ static int extended_search(struct ldb_module *module, 
struct ldb_request *req)
DATA_BLOB binary;
binary = strhex_to_data_blob(str);
if (!binary.data) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, 
NULL,
-  
LDB_ERR_OPERATIONS_ERROR);
+   ldb_oom(module-ldb);
+   return LDB_ERR_OPERATIONS_ERROR;
}
valstr = ldb_binary_encode(req, binary);
data_blob_free(binary);
if (!valstr) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, 
NULL,
-  
LDB_ERR_OPERATIONS_ERROR);
+   ldb_oom(module-ldb);
+   return LDB_ERR_OPERATIONS_ERROR;
}
}
 
@@ -493,9 +488,8 @@ static int extended_search(struct ldb_module *module, 
struct ldb_request *req)
base_dn = ldb_get_default_basedn(module-ldb);
base_dn_filter = talloc_asprintf(req, 
(objectGUID=%s), valstr);
if (!base_dn_filter) {
-   ldb_oom(ac-module-ldb);
-   return ldb_module_done(ac-req, NULL, NULL,
-  
LDB_ERR_OPERATIONS_ERROR);

Build status as of Fri Oct 3 00:00:02 2008

2008-10-02 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2008-10-02 
00:00:25.0 +
+++ /home/build/master/cache/broken_results.txt 2008-10-03 00:00:36.0 
+
@@ -1,12 +1,12 @@
-Build status as of Thu Oct  2 00:00:02 2008
+Build status as of Fri Oct  3 00:00:02 2008
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   30 8  0 
+ccache   33 8  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  31 32 0 
+ldb  33 32 0 
 libreplace   31 12 0 
 lorikeet-heimdal 29 20 0 
 pidl 19 19 0 
@@ -19,5 +19,5 @@
 samba_4_0_test 32 29 1 
 smb-build31 7  0 
 talloc   32 29 0 
-tdb  30 12 0 
+tdb  31 12 0