Build status as of Fri Oct 9 06:00:02 2009

2009-10-09 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-10-08 
00:00:03.0 -0600
+++ /home/build/master/cache/broken_results.txt 2009-10-09 00:00:03.0 
-0600
@@ -1,22 +1,22 @@
-Build status as of Thu Oct  8 06:00:02 2009
+Build status as of Fri Oct  9 06:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   2  1  0 
+ccache   1  1  0 
 distcc   0  0  0 
 ldb  26 26 0 
 libreplace   1  1  0 
 lorikeet 0  0  0 
-pidl 16 15 0 
-ppp  1  0  0 
+pidl 17 16 0 
+ppp  0  0  0 
 rsync2  1  0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 21 19 0 
-samba_3_master 23 23 5 
-samba_3_next 2  2  0 
+samba_3_current 22 21 0 
+samba_3_master 24 24 3 
+samba_3_next 23 23 0 
 samba_4_0_test 26 26 0 
 talloc   3  3  0 
-tdb  1  1  0 
+tdb  0  0  0

[SCM] Samba Shared Repository - branch v3-3-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  d411319... s3:mount.cifs: make mount.cifs -V print the version, 
not usage.
   via  2cda51b... Revert cifs mount did not properly display version 
string when no other parameters passed in.
  from  6c4fe10... WHATSNEW: Add more coherent explanation for bug #6680.

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


- Log -
commit d41131948346619be98514331d7059d9bffecac5
Author: Michael Adam ob...@samba.org
Date:   Thu Oct 8 10:44:48 2009 -0400

s3:mount.cifs: make mount.cifs -V print the version, not usage.

(cherry-picked from d7ca4997017e86b6f23ced64f1f1672bfb15716b)

Also make mount.cifs -h not exit with error exit code but with return 
code 0.

Michael

Part 2/2 of a fix for bug #6692 (mount.cifs segfault).

commit 2cda51b4e6fba53c04f87e4c2dd99a952a63d812
Author: Jeff Layton jlay...@redhat.com
Date:   Thu Oct 8 10:42:37 2009 -0400

Revert cifs mount did not properly display version string when no other 
parameters passed in.

This reverts commit c7bf0f4c222ae46be2a751997e03197832b494cd.

Part 1/2 of a fix for bug #6692.

---

Summary of changes:
 source/client/mount.cifs.c |   41 -
 1 files changed, 28 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index c78aee0..0add7a8 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -1036,6 +1036,14 @@ uppercase_string(char *string)
return 1;
 }
 
+static void print_cifs_mount_version(void)
+{
+   printf(mount.cifs version: %s.%s%s\n,
+   MOUNT_CIFS_VERSION_MAJOR,
+   MOUNT_CIFS_VERSION_MINOR,
+   MOUNT_CIFS_VENDOR_SUFFIX);
+}
+
 int main(int argc, char ** argv)
 {
int c;
@@ -1097,15 +1105,25 @@ int main(int argc, char ** argv)
exit(EX_SYSERR);
}
mountpoint = argv[2];
-   } else {
-   if ((strcmp (argv[1], --version) == 0) ||
-   ((strcmp (argv[1], -V) == 0))) {
-   printf (mount.cifs version: %s.%s%s\n,
-   MOUNT_CIFS_VERSION_MAJOR,
-   MOUNT_CIFS_VERSION_MINOR,
-   MOUNT_CIFS_VENDOR_SUFFIX);
-   exit (0);
+   } else if (argc == 2) {
+   if ((strcmp(argv[1], -V) == 0) ||
+   (strcmp(argv[1], --version) == 0))
+   {
+   print_cifs_mount_version();
+   exit(0);
+   }
+
+   if ((strcmp(argv[1], -h) == 0) ||
+   (strcmp(argv[1], -?) == 0) ||
+   (strcmp(argv[1], --help) == 0))
+   {
+   mount_cifs_usage();
+   exit(0);
}
+
+   mount_cifs_usage();
+   exit(EX_USAGE);
+   } else {
mount_cifs_usage();
exit(EX_USAGE);
}
@@ -1161,11 +1179,8 @@ int main(int argc, char ** argv)
case 'v':
++verboseflag;
break;
-   case 'V':  
-   printf (mount.cifs version: %s.%s%s\n,
-   MOUNT_CIFS_VERSION_MAJOR,
-   MOUNT_CIFS_VERSION_MINOR,
-   MOUNT_CIFS_VENDOR_SUFFIX);
+   case 'V':
+   print_cifs_mount_version();
exit (0);
case 'w':
flags = ~MS_RDONLY;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  fdc28f6... Fix bug 6769 - symlink unlink does nothing. Jeremy.
  from  d411319... s3:mount.cifs: make mount.cifs -V print the version, 
not usage.

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


- Log -
commit fdc28f6700c97e1276e3d6ae1f242f7daa9bab9e
Author: Jeremy Allison j...@samba.org
Date:   Thu Oct 8 15:55:35 2009 -0700

Fix bug 6769 - symlink unlink does nothing. Jeremy.

---

Summary of changes:
 source/modules/vfs_default.c |6 +++-
 source/smbd/posix_acls.c |   57 +++---
 source/smbd/reply.c  |   49 
 3 files changed, 85 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c
index 1e95633..d8ef888 100644
--- a/source/modules/vfs_default.c
+++ b/source/modules/vfs_default.c
@@ -993,7 +993,11 @@ static NTSTATUS vfswrap_streaminfo(vfs_handle_struct 
*handle,
ret = SMB_VFS_FSTAT(fsp, sbuf);
}
else {
-   ret = SMB_VFS_STAT(handle-conn, fname, sbuf);
+   if (lp_posix_pathnames()) {
+   ret = SMB_VFS_LSTAT(handle-conn, fname, sbuf);
+   } else {
+   ret = SMB_VFS_STAT(handle-conn, fname, sbuf);
+   }
}
 
if (ret == -1) {
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 1afd48e..c8d9e00 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3178,13 +3178,19 @@ NTSTATUS posix_get_nt_acl(struct connection_struct 
*conn, const char *name,
SMB_ACL_T posix_acl = NULL;
SMB_ACL_T def_acl = NULL;
struct pai_val *pal;
+   int ret;
 
*ppdesc = NULL;
 
DEBUG(10,(posix_get_nt_acl: called for file %s\n, name ));
 
/* Get the stat struct for the owner info. */
-   if(SMB_VFS_STAT(conn, name, sbuf) != 0) {
+   if (lp_posix_pathnames()) {
+   ret = SMB_VFS_LSTAT(conn, name, sbuf);
+   } else {
+   ret = SMB_VFS_STAT(conn, name, sbuf);
+   }
+   if(ret != 0) {
return map_nt_error_from_unix(errno);
}
 
@@ -3218,6 +3224,7 @@ int try_chown(connection_struct *conn, const char *fname, 
uid_t uid, gid_t gid)
int ret;
files_struct *fsp;
SMB_STRUCT_STAT st;
+   bool posix_paths = lp_posix_pathnames();
 
if(!CAN_WRITE(conn)) {
return -1;
@@ -3225,7 +3232,11 @@ int try_chown(connection_struct *conn, const char 
*fname, uid_t uid, gid_t gid)
 
/* Case (1). */
/* try the direct way first */
-   ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+   if (posix_paths) {
+   ret = SMB_VFS_LCHOWN(conn, fname, uid, gid);
+   } else {
+   ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+   }
if (ret == 0)
return 0;
 
@@ -3265,7 +3276,12 @@ int try_chown(connection_struct *conn, const char 
*fname, uid_t uid, gid_t gid)
return -1;
}
 
-   if (SMB_VFS_STAT(conn,fname,st)) {
+   if (posix_paths) {
+   ret = SMB_VFS_LSTAT(conn,fname,st);
+   } else {
+   ret = SMB_VFS_STAT(conn,fname,st);
+   }
+   if (ret != 0) {
return -1;
}
 
@@ -3497,6 +3513,8 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
bool set_acl_as_root = false;
bool acl_set_support = false;
bool ret = false;
+   bool posix_paths = lp_posix_pathnames();
+   int sret;
 
DEBUG(10,(set_nt_acl: called for file %s\n, fsp-fsp_name ));
 
@@ -3510,8 +3528,14 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
 */
 
if(fsp-is_directory || fsp-fh-fd == -1) {
-   if(SMB_VFS_STAT(fsp-conn,fsp-fsp_name, sbuf) != 0)
+   if (posix_paths) {
+   sret = SMB_VFS_LSTAT(fsp-conn,fsp-fsp_name, sbuf);
+   } else {
+   sret = SMB_VFS_STAT(fsp-conn,fsp-fsp_name, sbuf);
+   }
+   if (sret != 0) {
return map_nt_error_from_unix(errno);
+   }
} else {
if(SMB_VFS_FSTAT(fsp, sbuf) != 0)
return map_nt_error_from_unix(errno);
@@ -3555,17 +3579,24 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
 */
 
if(fsp-is_directory) {
-   if(SMB_VFS_STAT(fsp-conn, fsp-fsp_name, sbuf) != 0) {
+   if (posix_paths) {
+   sret = SMB_VFS_LSTAT(fsp-conn, fsp-fsp_name, 
sbuf);
+   } else {
+

[SCM] Samba Shared Repository - branch v3-4-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-4-test has been updated
   via  9f7d155... Fix bug 6769 - symlink unlink does nothing. Jeremy.
  from  8ef4a18... s3:winbind: Only ever handle one event after a select 
call

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


- Log -
commit 9f7d155001bc4c2808b6d17e9cb5ce87173b6061
Author: Jeremy Allison j...@samba.org
Date:   Thu Oct 8 16:40:26 2009 -0700

Fix bug 6769 - symlink unlink does nothing. Jeremy.

---

Summary of changes:
 source3/modules/vfs_default.c |6 +++-
 source3/smbd/posix_acls.c |   57 ++---
 source3/smbd/reply.c  |   49 +++
 3 files changed, 85 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 0a66531..ca401b6 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1130,7 +1130,11 @@ static NTSTATUS vfswrap_streaminfo(vfs_handle_struct 
*handle,
ret = SMB_VFS_FSTAT(fsp, sbuf);
}
else {
-   ret = SMB_VFS_STAT(handle-conn, fname, sbuf);
+   if (lp_posix_pathnames()) {
+   ret = SMB_VFS_LSTAT(handle-conn, fname, sbuf);
+   } else {
+   ret = SMB_VFS_STAT(handle-conn, fname, sbuf);
+   }
}
 
if (ret == -1) {
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 53bfaa1..766c7b0 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3341,13 +3341,19 @@ NTSTATUS posix_get_nt_acl(struct connection_struct 
*conn, const char *name,
SMB_ACL_T posix_acl = NULL;
SMB_ACL_T def_acl = NULL;
struct pai_val *pal;
+   int ret;
 
*ppdesc = NULL;
 
DEBUG(10,(posix_get_nt_acl: called for file %s\n, name ));
 
/* Get the stat struct for the owner info. */
-   if(SMB_VFS_STAT(conn, name, sbuf) != 0) {
+   if (lp_posix_pathnames()) {
+   ret = SMB_VFS_LSTAT(conn, name, sbuf);
+   } else {
+   ret = SMB_VFS_STAT(conn, name, sbuf);
+   }
+   if(ret != 0) {
return map_nt_error_from_unix(errno);
}
 
@@ -3381,6 +3387,7 @@ int try_chown(connection_struct *conn, const char *fname, 
uid_t uid, gid_t gid)
int ret;
files_struct *fsp;
SMB_STRUCT_STAT st;
+   bool posix_paths = lp_posix_pathnames();
 
if(!CAN_WRITE(conn)) {
return -1;
@@ -3388,7 +3395,11 @@ int try_chown(connection_struct *conn, const char 
*fname, uid_t uid, gid_t gid)
 
/* Case (1). */
/* try the direct way first */
-   ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+   if (posix_paths) {
+   ret = SMB_VFS_LCHOWN(conn, fname, uid, gid);
+   } else {
+   ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+   }
if (ret == 0)
return 0;
 
@@ -3428,7 +3439,12 @@ int try_chown(connection_struct *conn, const char 
*fname, uid_t uid, gid_t gid)
return -1;
}
 
-   if (SMB_VFS_STAT(conn,fname,st)) {
+   if (posix_paths) {
+   ret = SMB_VFS_LSTAT(conn,fname,st);
+   } else {
+   ret = SMB_VFS_STAT(conn,fname,st);
+   }
+   if (ret != 0) {
return -1;
}
 
@@ -3664,6 +3680,8 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
bool set_acl_as_root = false;
bool acl_set_support = false;
bool ret = false;
+   bool posix_paths = lp_posix_pathnames();
+   int sret;
 
DEBUG(10,(set_nt_acl: called for file %s\n, fsp-fsp_name ));
 
@@ -3677,8 +3695,14 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
 */
 
if(fsp-is_directory || fsp-fh-fd == -1) {
-   if(SMB_VFS_STAT(fsp-conn,fsp-fsp_name, sbuf) != 0)
+   if (posix_paths) {
+   sret = SMB_VFS_LSTAT(fsp-conn,fsp-fsp_name, sbuf);
+   } else {
+   sret = SMB_VFS_STAT(fsp-conn,fsp-fsp_name, sbuf);
+   }
+   if (sret != 0) {
return map_nt_error_from_unix(errno);
+   }
} else {
if(SMB_VFS_FSTAT(fsp, sbuf) != 0)
return map_nt_error_from_unix(errno);
@@ -3722,17 +3746,24 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 
security_info_sent, const SEC_DESC
 */
 
if(fsp-is_directory) {
-   if(SMB_VFS_STAT(fsp-conn, fsp-fsp_name, sbuf) != 0) {
+   if (posix_paths) {
+   sret = SMB_VFS_LSTAT(fsp-conn, fsp-fsp_name, 
sbuf);
+   } else {
+

[SCM] Samba Shared Repository - branch v3-4-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-4-test has been updated
   via  37f42ad... Correct fix for bug 6781 - Cannot rename subfolders in 
Explorer view with recent versions of Samba. Without this fix, renaming a 
directory ./a to ./b, whilst a directory ./aa was already open would fail. 
Simplifies logic of earlier code. Jeremy.
  from  9f7d155... Fix bug 6769 - symlink unlink does nothing. Jeremy.

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


- Log -
commit 37f42ad6a1fff1e43bfd6dcaa8244b738ea37363
Author: Jeremy Allison j...@samba.org
Date:   Wed Oct 7 15:46:57 2009 -0700

Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with 
recent versions of Samba. Without this fix, renaming a directory ./a to ./b, 
whilst a directory ./aa was already open would fail. Simplifies logic of 
earlier code. Jeremy.

---

Summary of changes:
 source3/smbd/files.c |   32 
 1 files changed, 12 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 54c4c73..6f82686 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -385,13 +385,12 @@ bool file_find_subpath(files_struct *dir_fsp)
 {
files_struct *fsp;
size_t dlen;
-   bool ret = false;
char *d_fullname = talloc_asprintf(talloc_tos(),
%s/%s,
dir_fsp-conn-connectpath,
dir_fsp-fsp_name);
if (!d_fullname) {
-   goto out;
+   return false;
}
 
dlen = strlen(d_fullname);
@@ -408,28 +407,21 @@ bool file_find_subpath(files_struct *dir_fsp)
fsp-conn-connectpath,
fsp-fsp_name);
 
-   if (strnequal(d_fullname, d1_fullname, dlen)) {
-   int d1_len = strlen(d1_fullname);
-
-   /*
-* If the open file is a second file handle to the
-* same name or is a stream on the original file, then
-* don't return true.
-*/
-   if (d1_len == dlen || d1_fullname[dlen] == ':') {
-   TALLOC_FREE(d1_fullname);
-   continue;
-   }
-
+/*
+* If the open file has a path that is a longer
+* component, then it's a subpath.
+*/
+   if (strnequal(d_fullname, d1_fullname, dlen) 
+   (d1_fullname[dlen] == '/')) {
TALLOC_FREE(d1_fullname);
-   ret = true;
-   goto out;
+   TALLOC_FREE(d_fullname);
+   return true;
}
TALLOC_FREE(d1_fullname);
-   } 
- out:
+   }
+
TALLOC_FREE(d_fullname);
-   return ret;
+   return false;
 }
 
 /


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  1f604d2... Correct fix for bug 6781 - Cannot rename subfolders in 
Explorer view with recent versions of Samba. Without this fix, renaming a 
directory ./a to ./b, whilst a directory ./aa was already open would fail. 
Jeremy.
  from  fdc28f6... Fix bug 6769 - symlink unlink does nothing. Jeremy.

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


- Log -
commit 1f604d26d038956a6ddde892610c9b2254268160
Author: Jeremy Allison j...@samba.org
Date:   Wed Oct 7 15:49:56 2009 -0700

Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with 
recent versions of Samba. Without this fix, renaming a directory ./a to ./b, 
whilst a directory ./aa was already open would fail. Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/files.c b/source/smbd/files.c
index cdaa5f1..e74ad7a 100644
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -407,13 +407,18 @@ bool file_find_subpath(files_struct *dir_fsp)
fsp-conn-connectpath,
fsp-fsp_name);
 
-   if (strnequal(d_fullname, d1_fullname, dlen)) {
+   /*
+* If the open file has a path that is a longer
+* component, then it's a subpath.
+*/
+   if (strnequal(d_fullname, d1_fullname, dlen) 
+   (d1_fullname[dlen] == '/')) {
TALLOC_FREE(d_fullname);
TALLOC_FREE(d1_fullname);
return true;
}
TALLOC_FREE(d1_fullname);
-   } 
+   }
 
TALLOC_FREE(d_fullname);
return false;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-4-test has been updated
   via  c0cbfde... s3/Makefile: BUG 6791: Fix link order for libwbclient.
   via  7aea6ad... s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.
  from  37f42ad... Correct fix for bug 6781 - Cannot rename subfolders in 
Explorer view with recent versions of Samba. Without this fix, renaming a 
directory ./a to ./b, whilst a directory ./aa was already open would fail. 
Simplifies logic of earlier code. Jeremy.

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


- Log -
commit c0cbfdef387bf70e589dec6a3bbd434d12cacc34
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Oct 9 08:58:55 2009 +0200

s3/Makefile: BUG 6791: Fix link order for libwbclient.

Patch was provided by Buchan Milne bgmi...@mandriva.org.

Signed-off-by: Björn Jacke b...@sernet.de

commit 7aea6adcede87a2389d933eedc50f836ba161f95
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Oct 9 08:55:53 2009 +0200

s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.

Patch was originally provided by Buchan Milne bgmi...@mandriva.org.

Signed-off-by: Björn Jacke b...@sernet.de

---

Summary of changes:
 source3/Makefile.in |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6ac9571..97b86fc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1470,7 +1470,7 @@ bin/cifs.upc...@exeext@: $(BINARY_PREREQS) 
$(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ
@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
-   $(LIBTDB_LIBS) $(NSCD_LIBS)
+   $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
 
 bin/testp...@exeext@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ 
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
@@ -1872,7 +1872,7 @@ $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
 
 $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) 
$(LIBWBCLIENT_SYMS) @LIBTALLOC_TARGET@
@echo Linking shared library $@
-   @$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
+   @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBTALLOC_LIBS) \
@sonamef...@`basename $...@`
 
 $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
@@ -2050,7 +2050,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) 
$(LIBNETAPI_OBJ) $(LIBNETAP
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
-   $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+   $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
@sonamef...@`basename $...@`
 
 $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
@@ -2386,7 +2386,7 @@ bin/v...@exeext@: $(BINARY_PREREQS) $(VLP_OBJ) 
@LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) 
$(LIBTDB_LIBS) \
-   @sonamef...@`basename $...@`@NSSSONAMEVERSIONSUFFIX@
+   $(ZLIB_LIBS) @sonamef...@`basename 
$...@`@NSSSONAMEVERSIONSUFFIX@
 
 bin/winbind_krb5_locat...@shlibext@: $(BINARY_PREREQS) 
$(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@
@echo Linking $@


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  b638a21... WHATSNEW: Update WHATSNEW.
  from  0dc5d0b... s4/torture: Add server target of OneFS

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


- Log -
commit b638a210f8deacb5cbd56ce273e7efd9bb052054
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Oct 9 09:22:02 2009 +0200

WHATSNEW: Update WHATSNEW.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 066f718..1cfa69c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,36 +1,15 @@
=
-   Release Notes for Samba 3.4.0pre1
+   Release Notes for Samba 3.5.0pre1
 
=
 
-This is the first preview release of Samba 3.4.  This is *not*
+This is the first preview release of Samba 3.5.  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/.
 
-Major enhancements in Samba 3.4.0 include:
+Major enhancements in Samba 3.5.0 include:
 
-Authentication Changes:
-o Changed the way smbd handles untrusted domain names given during user
-  authentication
-
-Authentication Changes
-==
-
-Previously, when Samba was a domain member and a client was connecting using an
-untrusted domain name, such as BOGUS\user smbd would remap the untrusted
-domain to the primary domain smbd was a member of and attempt authentication
-using that DOMAIN\user name.  This differed from how a Windows member server
-would behave.  Now, smbd will replace the BOGUS name with it's SAM name.  In
-the case where smbd is acting as a PDC this will be DOMAIN\user.  In the case
-where smbd is acting as a domain member server this will be WORKSTATION\user.
-Thus, smbd will never assume that an incoming user name which is not qualified
-with the same primary domain, is part of smbd's primary domain.
-
-While this behavior matches Windows, it may break some workflows which depended
-on smbd to always pass through bogus names to the DC for verification.  A new
-parameter map untrusted to domain can be enabled to revert to the legacy
-behavior.
 
 ##
 Reporting bugs  Development Discussion
@@ -42,7 +21,7 @@ joining the #samba-technical IRC channel on irc.freenode.net.
 If you do report problems then please try to send high quality
 feedback. If you don't provide vital information to help us track down
 the problem then you will probably be ignored.  All bug reports should
-be filed under the Samba 3.4 product in the project's Bugzilla
+be filed under the Samba 3.5 product in the project's Bugzilla
 database (https://bugzilla.samba.org/).
 
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

2009-10-09 Thread Karolin Seeger 
The branch, v3-4-test has been updated
   via  a13f8bf... s3/aio: allow for outstanding_aio_calls to be 
decremented.
  from  c0cbfde... s3/Makefile: BUG 6791: Fix link order for libwbclient.

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


- Log -
commit a13f8bf949300079419cd86982012212323fcb65
Author: Olaf Flebbe o.fle...@science-computing.de
Date:   Wed Sep 30 14:55:58 2009 +0200

s3/aio: allow for outstanding_aio_calls to be decremented.

Fixes bug #6772.

---

Summary of changes:
 source3/smbd/aio.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index fbfec46..e5e522c 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -187,6 +187,7 @@ bool schedule_aio_read_and_X(connection_struct *conn,
return False;
}
 
+   outstanding_aio_calls++;
aio_ex-req = talloc_move(aio_ex, req);
 
DEBUG(10,(schedule_aio_read_and_X: scheduled aio_read for file %s, 
@@ -195,7 +196,6 @@ bool schedule_aio_read_and_X(connection_struct *conn,
  (unsigned int)aio_ex-req-mid ));
 
srv_defer_sign_response(aio_ex-req-mid);
-   outstanding_aio_calls++;
return True;
 }
 
@@ -283,6 +283,7 @@ bool schedule_aio_write_and_X(connection_struct *conn,
return False;
}
 
+   outstanding_aio_calls++;
aio_ex-req = talloc_move(aio_ex, req);
 
/* This should actually be improved to span the write. */
@@ -307,7 +308,6 @@ bool schedule_aio_write_and_X(connection_struct *conn,
} else {
srv_defer_sign_response(aio_ex-req-mid);
}
-   outstanding_aio_calls++;
 
DEBUG(10,(schedule_aio_write_and_X: scheduled aio_write for file 
  %s, offset %.0f, len = %u (mid = %u) 
@@ -523,6 +523,8 @@ void smbd_aio_complete_mid(unsigned int mid)
struct aio_extra *aio_ex = find_aio_ex(mid);
int ret = 0;
 
+   outstanding_aio_calls--;
+
DEBUG(10,(smbd_aio_complete_mid: mid[%u]\n, mid));
 
if (!aio_ex) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2009-10-09 Thread Karolin Seeger 
The branch, master has been updated
   via  fc2604e... asn1_tests: Fix typo in comment.
  from  333fcba... Cope with old CIFSFS clients that use SMBunlink to 
remove symlinks instead of trans2:posix_unlink. Jeremy.

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


- Log -
commit fc2604ed26b4515813c0539788c49f6fab62750e
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Oct 9 11:27:06 2009 +0200

asn1_tests: Fix typo in comment.

Karolin

---

Summary of changes:
 lib/util/tests/asn1_tests.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/tests/asn1_tests.c b/lib/util/tests/asn1_tests.c
index 56363c2..eea34da 100644
--- a/lib/util/tests/asn1_tests.c
+++ b/lib/util/tests/asn1_tests.c
@@ -28,7 +28,7 @@ struct oid_data {
const char *bin_oid;/* Binary OID represented as string */
 };
 
-/* Data for successfull OIDs conversions */
+/* Data for successful OIDs conversions */
 struct oid_data oid_data_ok[] = {
{
.oid = 2.5.4.0,
@@ -64,7 +64,7 @@ struct oid_data oid_data_ok[] = {
},
 };
 
-/* Data for successfull Partial OIDs conversions */
+/* Data for successful Partial OIDs conversions */
 struct oid_data partial_oid_data_ok[] = {
{
.oid = 2.5.4.130:0x81,


-- 
Samba Shared Repository

svn commit: samba-web r1332 - in trunk/docs: .

2009-10-09 Thread kseeger 
Author: kseeger
Date: 2009-10-09 05:01:43 -0600 (Fri, 09 Oct 2009)
New Revision: 1332

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

Log:
Remove broken links.
Chris, maybe you would like to re-add a working link.
Karolin
Modified:
   trunk/docs/index.html


Changeset:
Modified: trunk/docs/index.html
===
--- trunk/docs/index.html   2009-10-02 06:57:11 UTC (rev 1331)
+++ trunk/docs/index.html   2009-10-09 11:01:43 UTC (rev 1332)
@@ -115,27 +115,11 @@
 
 
 div class=book
-  a 
href=http://www.osoft.com/store/productdetails.php?pid=60amp;cPath=33amp;cid=33amp;it=5;
-  img src=http://www.osoft.com/store/products/Samba-Compendium.png; 
alt=Samba
-  3 Compendium //a
-  pa 
href=http://www.osoft.com/store/productdetails.php?pid=60amp;cPath=33amp;cid=33amp;it=5;
-  The Samba3 Compendium/a e-Book contains all of the official Samba 
documentation in the ThoutReader(TM) format.
-  It includes The Samba3-HOWTO, The Samba3-ByExample, The 
Samba3-Developers-Guide, and the Samba3 Man Pages
-  in one searchable document that supports public notes. Portion of the 
proceeds goes to Samba.org./p
-/div
-
-
-div class=book
-a 
href=http://www.informit.com/content/index.asp?product_id={86DF4173-6CC1-4422-900B-B124658449D8}amp;aid={1C5CBAF6-D6CB-4A8C-8FD2-F112C8CBC9F0};
-img src=/samba/images/impCIFS.png alt=Implementing CIFS //a
-pTeam member Chris Hertel has written a book titled a
-href=http://www.informit.com/content/index.asp?product_id={86DF4173-6CC1-4422-9
-00B-B124658449D8}amp;aid={1C5CBAF6-D6CB-4A8C-8FD2-F112C8CBC9F0}Implementing
-CIFS/a, which explores the workings and quirks of the SMB/CIFS
+pTeam member Chris Hertel has written a book titled bImplementing 
CIFS/b,
+which explores the workings and quirks of the SMB/CIFS
 protocol suite.  It is aimed at network managers, security analysts, and
 SMB/CIFS implementors.  In the spirit of Open Source, the entire
-content of the book is available a
-href=http://ubiqx.org/cifs/;online/a!/p
+content of the book is available a 
href=http://ubiqx.org/cifs/;online/a!/p
 /div
 
 p class=plugsMore Samba Books on the a href=/samba/books.htmlSamba

[SCM] CTDB repository - branch master updated - ctdb-1.0.93-3-g687535b

2009-10-09 Thread Ronnie Sahlberg 
The branch, master has been updated
   via  687535b51622d1fac7ccb38fa640bf1febd69fd8 (commit)
   via  5cb4d63bf6887d15aba37fafc3f6b6ba38027f13 (commit)
  from  f72d33ac73ebb1af802bacdfb30279df3cd8b8f9 (commit)

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


- Log -
commit 687535b51622d1fac7ccb38fa640bf1febd69fd8
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Fri Oct 9 22:22:11 2009 +1100

Fix bug spotted by Metze,

the argument to ctdb_control_event_Script_disabled() is a string not a 
uint32

commit 5cb4d63bf6887d15aba37fafc3f6b6ba38027f13
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Oct 8 19:17:57 2009 +1100

version 1.0.94

---

Summary of changes:
 packaging/RPM/ctdb.spec |4 +++-
 server/eventscript.c|6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 2d97b85..8e68200 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team sa...@samba.org
 Name: ctdb
-Version: 1.0.93
+Version: 1.0.94
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -132,6 +132,8 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Thu Oct 10 2009 : Version 1.0.94
+ - Be very aggressive and quickly ban nodes that can not freeze their databases
 * Tue Oct 8 2009 : Version 1.0.93
  - When adding an ip, make sure to update this assignment on all nodes
so it wont show up as -1 on other nodes.
diff --git a/server/eventscript.c b/server/eventscript.c
index b60b1e4..bbb4016 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -193,13 +193,13 @@ int32_t ctdb_control_event_script_stop(struct 
ctdb_context *ctdb, TDB_DATA indat
  */
 int32_t ctdb_control_event_script_disabled(struct ctdb_context *ctdb, TDB_DATA 
indata)
 {
-   int32_t res = *((int32_t *)indata.dptr);
+   const char *name = (const char *)indata.dptr;
struct ctdb_monitoring_status *monitoring_status =
talloc_get_type(ctdb-script_monitoring_ctx,
struct ctdb_monitoring_status);
struct ctdb_monitor_script_status *script;
 
-   DEBUG(DEBUG_INFO, (event script disabed called : %d\n, (int)res));
+   DEBUG(DEBUG_INFO, (event script disabed called for script %s\n, 
name));
 
if (monitoring_status == NULL) {
DEBUG(DEBUG_ERR,(__location__  script_status is NULL when 
script finished.\n));
@@ -213,7 +213,7 @@ int32_t ctdb_control_event_script_disabled(struct 
ctdb_context *ctdb, TDB_DATA i
}
 
script-finished = timeval_current();
-   script-status   = res;
+   script-status   = 0;
script-disabled = 1;
 
return 0;


-- 
CTDB repository

[SCM] Samba Shared Repository - branch master updated

2009-10-09 Thread John Terpstra 
The branch, master has been updated
   via  8283aff... Change recommended bu PC Oota.
  from  fc2604e... asn1_tests: Fix typo in comment.

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


- Log -
commit 8283affee6fb0bb0347aa6fcd3033a61eaf6c27d
Author: John H Terpstra j...@samba.org
Date:   Fri Oct 9 07:00:11 2009 -0500

Change recommended bu PC Oota.

---

Summary of changes:
 docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml 
b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
index 2c59aa7..b7eaa06 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
@@ -602,7 +602,7 @@ instructions on downloading the source code.
 To allow domain users the ability to access Samba shares and files, as well as 
potentially other services
 provided by your Samba machine, PAM must be set up properly on your
 machine. In order to compile the Winbind modules, the PAM development 
libraries should be installed
-on your system. Please refer to the PAM Web site ulink 
url=http://www.kernel.org/pub/linux/libs/pam//.
+on your system. Please refer to the ulink 
url=http://www.kernel.org/pub/linux/libs/pam/;PAM Web Site/ulink.
 /para
 /sect2
 
@@ -1230,7 +1230,7 @@ pre-create the directories of users to make sure users 
can log in on UNIX with t
 indextermprimaryWinbind/primary/indexterm
 indextermprimaryftp access/primary/indexterm
 The filename/etc/pam.d/ftp/filename file can be changed to allow Winbind 
ftp access in a manner similar to
-the filename/etc/pam.d/samba/filename file. My 
filename/etc/pam.d/ftp/filename file was changed to look like this:
+the filename/etc/pam.d/samba/filenameSamba file. My 
filename/etc/pam.d/ftp/filename file was changed to look like this:
 programlisting
 auth   required /lib/security/pam_listfile.so item=user sense=deny \
 file=/etc/ftpusers onerr=succeed


-- 
Samba Shared Repository

changes to wbclient.h (Re: [SCM] Samba Shared Repository - branch master updated)

2009-10-09 Thread Stefan (metze) Metzmacher 
Hi Matthias,
 diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
 index 4dc6d23..ced82d8 100644
 --- a/nsswitch/libwbclient/wbclient.h
 +++ b/nsswitch/libwbclient/wbclient.h
 @@ -427,10 +427,15 @@ struct wbcUserPasswordPolicyInfo {
   **/
  
  enum wbcPasswordChangeRejectReason {
 - WBC_PWD_CHANGE_REJECT_OTHER=0,
 - WBC_PWD_CHANGE_REJECT_TOO_SHORT=1,
 - WBC_PWD_CHANGE_REJECT_IN_HISTORY=2,
 - WBC_PWD_CHANGE_REJECT_COMPLEXITY=5
 + WBC_PWD_CHANGE_NO_ERROR=0,
 + WBC_PWD_CHANGE_PASSWORD_TOO_SHORT=1,
 + WBC_PWD_CHANGE_PWD_IN_HISTORY=2,
 + WBC_PWD_CHANGE_USERNAME_IN_PASSWORD=3,
 + WBC_PWD_CHANGE_FULLNAME_IN_PASSWORD=4,
 + WBC_PWD_CHANGE_NOT_COMPLEX=5,
 + WBC_PWD_CHANGE_MACHINE_NOT_DEFAULT=6,
 + WBC_PWD_CHANGE_FAILED_BY_FILTER=7,
 + WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
  };

wbclient.h is a public interface, where we can't change existing code!

At least we need to add the old enum values as defines to the new ones.

metze

Re: changes to wbclient.h (Re: [SCM] Samba Shared Repository - branch master updated)

2009-10-09 Thread simo 
On Fri, 2009-10-09 at 17:35 +0200, Stefan (metze) Metzmacher wrote:
 Hi Matthias,
  diff --git a/nsswitch/libwbclient/wbclient.h 
  b/nsswitch/libwbclient/wbclient.h
  index 4dc6d23..ced82d8 100644
  --- a/nsswitch/libwbclient/wbclient.h
  +++ b/nsswitch/libwbclient/wbclient.h
  @@ -427,10 +427,15 @@ struct wbcUserPasswordPolicyInfo {
**/
   
   enum wbcPasswordChangeRejectReason {
  -   WBC_PWD_CHANGE_REJECT_OTHER=0,
  -   WBC_PWD_CHANGE_REJECT_TOO_SHORT=1,
  -   WBC_PWD_CHANGE_REJECT_IN_HISTORY=2,
  -   WBC_PWD_CHANGE_REJECT_COMPLEXITY=5
  +   WBC_PWD_CHANGE_NO_ERROR=0,
  +   WBC_PWD_CHANGE_PASSWORD_TOO_SHORT=1,
  +   WBC_PWD_CHANGE_PWD_IN_HISTORY=2,
  +   WBC_PWD_CHANGE_USERNAME_IN_PASSWORD=3,
  +   WBC_PWD_CHANGE_FULLNAME_IN_PASSWORD=4,
  +   WBC_PWD_CHANGE_NOT_COMPLEX=5,
  +   WBC_PWD_CHANGE_MACHINE_NOT_DEFAULT=6,
  +   WBC_PWD_CHANGE_FAILED_BY_FILTER=7,
  +   WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
   };
 
 wbclient.h is a public interface, where we can't change existing code!
 
 At least we need to add the old enum values as defines to the new ones.


Martthias,
*please* be extra-careful when you touch stuff outside source4 or in
source4/lib/ldb
We have APIs and possibly ABIs to keep stable, in case of doubt rather
than just pushing the code send a patch to samba-technical for review.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer s...@samba.org
Principal Software Engineer at Red Hat, Inc. s...@redhat.com

[SCM] Samba Shared Repository - branch master updated

2009-10-09 Thread Simo Sorce 
The branch, master has been updated
   via  99cdbe3... Fix builds with external talloc
  from  8283aff... Change recommended bu PC Oota.

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


- Log -
commit 99cdbe35717dcd7b8adabae2b8b366dd87357807
Author: Simo Sorce i...@samba.org
Date:   Fri Oct 9 13:14:08 2009 -0400

Fix builds with external talloc

Make sure we do not reference our internal talloc directly.
Let configure define what talloc.h file to use so that builds that use an
extrenal talloc do not include 2 different versions of the talloc header.

---

Summary of changes:
 lib/util/talloc_stack.h |2 +-
 nsswitch/libwbclient/wbclient.c |4 ++--
 source3/include/includes.h  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
index bb22b8a..7776711 100644
--- a/lib/util/talloc_stack.h
+++ b/lib/util/talloc_stack.h
@@ -35,7 +35,7 @@
 #ifndef _TALLOC_STACK_H
 #define _TALLOC_STACK_H
 
-#include ../talloc/talloc.h
+#include talloc.h
 
 /*
  * Create a new talloc stack frame.
diff --git a/nsswitch/libwbclient/wbclient.c b/nsswitch/libwbclient/wbclient.c
index f4620ff..9a1e770 100644
--- a/nsswitch/libwbclient/wbclient.c
+++ b/nsswitch/libwbclient/wbclient.c
@@ -23,8 +23,8 @@
 /* Required Headers */
 
 #include replace.h
-#include lib/talloc/talloc.h
-#include lib/tevent/tevent.h
+#include talloc.h
+#include tevent.h
 #include libwbclient.h
 
 /* From wb_common.c */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 453c8b3..b3446cb 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -621,7 +621,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void 
*lp_ctx);
 #include tdb.h
 #include util_tdb.h
 
-#include ../talloc/talloc.h
+#include talloc.h
 
 #include event.h
 #include ../lib/util/tevent_unix.h


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

2009-10-09 Thread Simo Sorce 
The branch, v3-5-test has been updated
   via  030fbf2... Fix builds with external talloc
  from  b638a21... WHATSNEW: Update WHATSNEW.

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


- Log -
commit 030fbf28fc963065853c08015c34827656c29bfd
Author: Simo Sorce i...@samba.org
Date:   Fri Oct 9 13:14:08 2009 -0400

Fix builds with external talloc

Make sure we do not reference our internal talloc directly.
Let configure define what talloc.h file to use so that builds that use an
extrenal talloc do not include 2 different versions of the talloc header.

---

Summary of changes:
 lib/util/talloc_stack.h |2 +-
 nsswitch/libwbclient/wbclient.c |4 ++--
 source3/include/includes.h  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
index bb22b8a..7776711 100644
--- a/lib/util/talloc_stack.h
+++ b/lib/util/talloc_stack.h
@@ -35,7 +35,7 @@
 #ifndef _TALLOC_STACK_H
 #define _TALLOC_STACK_H
 
-#include ../talloc/talloc.h
+#include talloc.h
 
 /*
  * Create a new talloc stack frame.
diff --git a/nsswitch/libwbclient/wbclient.c b/nsswitch/libwbclient/wbclient.c
index f4620ff..9a1e770 100644
--- a/nsswitch/libwbclient/wbclient.c
+++ b/nsswitch/libwbclient/wbclient.c
@@ -23,8 +23,8 @@
 /* Required Headers */
 
 #include replace.h
-#include lib/talloc/talloc.h
-#include lib/tevent/tevent.h
+#include talloc.h
+#include tevent.h
 #include libwbclient.h
 
 /* From wb_common.c */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 453c8b3..b3446cb 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -621,7 +621,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void 
*lp_ctx);
 #include tdb.h
 #include util_tdb.h
 
-#include ../talloc/talloc.h
+#include talloc.h
 
 #include event.h
 #include ../lib/util/tevent_unix.h


-- 
Samba Shared Repository

AW: changes to wbclient.h (Re: [SCM] Samba Shared Repository - branch master updated)

2009-10-09 Thread Matthias Dieter Wallnöfer 
Hi Stefan,

yeah I know that my change is problematic. But I got a request from Günther to 
adapt the values as they're specified in samr.idl to allow further error case 
additions in winbind.

In particular consider the value 0: previous it was an other error but a 
lookup in the MS-SAMR documentation pointed out that it should mean no error at 
all.

So I'd strongly prefer to keep the patch in this form to have it right - from 
now on . I know it is cumbersome to break the API and external code has to be 
adapted - but personally I don't see a better solution.

Matthias

--- Stefan (metze) Metzmacher me...@samba.org schrieb am Fr, 9.10.2009:

Von: Stefan (metze) Metzmacher me...@samba.org
Betreff: changes to wbclient.h (Re: [SCM] Samba Shared Repository - branch 
master updated)
An: samba-techni...@lists.samba.org
CC: samba-...@samba.org
Datum: Freitag, 9. Oktober 2009, 17:35

Hi Matthias,
 diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
 index 4dc6d23..ced82d8 100644
 --- a/nsswitch/libwbclient/wbclient.h
 +++ b/nsswitch/libwbclient/wbclient.h
 @@ -427,10 +427,15 @@ struct wbcUserPasswordPolicyInfo {
   **/
  
  enum wbcPasswordChangeRejectReason {
 -    WBC_PWD_CHANGE_REJECT_OTHER=0,
 -    WBC_PWD_CHANGE_REJECT_TOO_SHORT=1,
 -    WBC_PWD_CHANGE_REJECT_IN_HISTORY=2,
 -    WBC_PWD_CHANGE_REJECT_COMPLEXITY=5
 +    WBC_PWD_CHANGE_NO_ERROR=0,
 +    WBC_PWD_CHANGE_PASSWORD_TOO_SHORT=1,
 +    WBC_PWD_CHANGE_PWD_IN_HISTORY=2,
 +    WBC_PWD_CHANGE_USERNAME_IN_PASSWORD=3,
 +    WBC_PWD_CHANGE_FULLNAME_IN_PASSWORD=4,
 +    WBC_PWD_CHANGE_NOT_COMPLEX=5,
 +    WBC_PWD_CHANGE_MACHINE_NOT_DEFAULT=6,
 +    WBC_PWD_CHANGE_FAILED_BY_FILTER=7,
 +    WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
  };

wbclient.h is a public interface, where we can't change existing code!

At least we need to add the old enum values as defines to the new ones.

metze

Re: AW: changes to wbclient.h (Re: [SCM] Samba Shared Repository - branch master updated)

2009-10-09 Thread Stefan (metze) Metzmacher 
Hi Matthias,

 yeah I know that my change is problematic. But I got a request from Günther 
 to adapt the values as they're specified in samr.idl to allow further error 
 case additions in winbind.
 
 In particular consider the value 0: previous it was an other error but a 
 lookup in the MS-SAMR documentation pointed out that it should mean no error 
 at all.
 
 So I'd strongly prefer to keep the patch in this form to have it right - from 
 now on . I know it is cumbersome to break the API and external code has to be 
 adapted - but personally I don't see a better solution.

I think we just need this, then it's fine:

#define WBC_PWD_CHANGE_REJECT_OTHER \
WBC_PWD_CHANGE_NO_ERROR
#define WBC_PWD_CHANGE_REJECT_TOO_SHORT \
WBC_PWD_CHANGE_PASSWORD_TOO_SHORT
#define WBC_PWD_CHANGE_REJECT_IN_HISTORY \
WBC_PWD_CHANGE_PWD_IN_HISTORY
#define WBC_PWD_CHANGE_REJECT_COMPLEXITY \
WBC_PWD_CHANGE_NOT_COMPLEX

metze

[SCM] Samba Shared Repository - branch master updated

2009-10-09 Thread Volker Lendecke 
The branch, master has been updated
   via  5aeb954... s3: Fix a memleak reported by dmarkey
  from  99cdbe3... Fix builds with external talloc

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


- Log -
commit 5aeb954ba9382e1975c64ac96f1e377ed6af3ae0
Author: Volker Lendecke v...@samba.org
Date:   Fri Oct 9 22:58:14 2009 +0200

s3: Fix a memleak reported by dmarkey

---

Summary of changes:
 nsswitch/libwbclient/wbc_sid.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index b1ecba3..99c9d8e 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -248,9 +248,13 @@ wbcErr wbcLookupSid(const struct wbcDomainSid *sid,
if (WBC_ERROR_IS_OK(wbc_status)) {
if (pdomain != NULL) {
*pdomain = domain;
+   } else {
+   TALLOC_FREE(domain);
}
if (pname != NULL) {
*pname = name;
+   } else {
+   TALLOC_FREE(name);
}
if (pname_type != NULL) {
*pname_type = name_type;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

2009-10-09 Thread Volker Lendecke 
The branch, v3-5-test has been updated
   via  1f1c293... s3: Fix a memleak reported by dmarkey
  from  030fbf2... Fix builds with external talloc

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


- Log -
commit 1f1c293d541fc2ab6dff5932ae1c9ffc1e8b58d3
Author: Volker Lendecke v...@samba.org
Date:   Fri Oct 9 22:58:14 2009 +0200

s3: Fix a memleak reported by dmarkey

---

Summary of changes:
 nsswitch/libwbclient/wbc_sid.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index b1ecba3..99c9d8e 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -248,9 +248,13 @@ wbcErr wbcLookupSid(const struct wbcDomainSid *sid,
if (WBC_ERROR_IS_OK(wbc_status)) {
if (pdomain != NULL) {
*pdomain = domain;
+   } else {
+   TALLOC_FREE(domain);
}
if (pname != NULL) {
*pname = name;
+   } else {
+   TALLOC_FREE(name);
}
if (pname_type != NULL) {
*pname_type = name_type;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2009-10-09 Thread Steven Danneman 
The branch, master has been updated
   via  622bffc... s4/torture: fix build break implicit declaration of 
function 'isprint'
  from  5aeb954... s3: Fix a memleak reported by dmarkey

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


- Log -
commit 622bffce4723353964bf0dc7bbf60235e417caa6
Author: Steven Danneman steven.danne...@isilon.com
Date:   Fri Oct 9 14:01:33 2009 -0700

s4/torture: fix build break implicit declaration of function 'isprint'

---

Summary of changes:
 source4/torture/smb2/streams.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index 50f27a8..f186a54 100644
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -32,6 +32,7 @@
 #include torture/util.h
 
 #include system/filesys.h
+#include system/locale.h
 
 #define DNAME teststreams
 


-- 
Samba Shared Repository