[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Günther Deschner 
The branch, master has been updated
   via  a319eb9... testprogs: add test_PrinterDataW.
   via  55946dd... testprogs: use dump_data in dump_printer_data.
   via  74ba0b7... testprogs: add print_printer_dataw and dump_data to 
printlib.
   via  66b4463... testprogs: add some multibyte versions of PrinterData 
calls.
  from  6384f45... s3: Rerun genmsg after adding more strings.

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


- Log -
commit a319eb9700bb6ae8aa217877181eaa37268e1c3b
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 4 01:35:33 2010 +0100

testprogs: add test_PrinterDataW.

Guenther

commit 55946ddd1db070cc94f8208aaf8f0f10eeef30b6
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 4 01:33:06 2010 +0100

testprogs: use dump_data in dump_printer_data.

Guenther

commit 74ba0b71891ce180079cc801e9fe11b4ea268e84
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 4 01:31:30 2010 +0100

testprogs: add print_printer_dataw and dump_data to printlib.

Guenther

commit 66b4463fc1a8c9aa0caf12765c4899ee0058a2b3
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 4 01:29:16 2010 +0100

testprogs: add some multibyte versions of PrinterData calls.

Guenther

---

Summary of changes:
 testprogs/win32/spoolss/printlib.c   |  120 ++
 testprogs/win32/spoolss/printlib_proto.h |1 +
 testprogs/win32/spoolss/spoolss.c|  211 ++
 3 files changed, 309 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testprogs/win32/spoolss/printlib.c 
b/testprogs/win32/spoolss/printlib.c
index f3541c8..829ac40 100644
--- a/testprogs/win32/spoolss/printlib.c
+++ b/testprogs/win32/spoolss/printlib.c
@@ -24,6 +24,10 @@
 #include assert.h
 #include sddl.h
 
+#ifndef MIN
+#define MIN(a,b) ((a)(b)?(a):(b))
+#endif
+
 void print_devmode(DEVMODE *pDevModeIn)
 {
if (pDevModeIn == NULL) {
@@ -1158,35 +1162,75 @@ LPSTR reg_type_str(DWORD type)
}
 }
 
-void print_printer_data(LPSTR keyname, LPSTR valuename, DWORD size, LPBYTE 
buffer, DWORD type)
+void print_asc(const BYTE *buf, DWORD len)
 {
-   DWORD i = 0;
-   LPSTR p = NULL;
-
-   if (keyname) {
-   printf(\tKey Name:\t%s\n, keyname);
+   int i;
+   for (i=0; ilen; i++) {
+   printf(%c, isprint(buf[i])?buf[i]:'.');
}
+}
 
-   printf(\tValue Name:\t%s\n, valuename);
-   printf(\tSize:\t\t0x%x (%d)\n, size, size);
-   printf(\tType:\t\t%s\n, reg_type_str(type));
+static void dump_data(const BYTE *buf, int len)
+{
+   int i=0;
+   static const BYTE empty[16] = { 0, };
 
-   if (buffer == NULL || size == 0) {
-   return;
+   if (len=0) return;
+
+   for (i=0; ilen;) {
+
+   if (i%16 == 0) {
+   if ((i  0) 
+   (len  i+16) 
+   (memcmp(buf[i], empty, 16) == 0))
+   {
+   i +=16;
+   continue;
+   }
+
+   if (ilen)  {
+   printf([%04X] ,i);
+   }
+   }
+
+   printf(%02x , buf[i]);
+   i++;
+
+   if (i%8 == 0) printf(  );
+   if (i%16 == 0) {
+   print_asc(buf[i-16],8); printf( );
+   print_asc(buf[i-8],8); printf(\n);
+   }
+   }
+
+   if (i%16) {
+   int n;
+   n = 16 - (i%16);
+   printf( );
+   if (n8) printf( );
+   while (n--) printf(   );
+   n = MIN(8,i%16);
+   print_asc(buf[i-(i%16)],n); printf(   );
+   n = (i%16) - n;
+   if (n0) print_asc(buf[i-n],n);
+   printf(\n);
}
+}
+
+static void dump_printer_data(DWORD size, LPBYTE buffer, DWORD type)
+{
+   DWORD i = 0;
+   LPSTR p = NULL;
 
switch (type) {
case REG_SZ:
-   printf(\t\t);
-   for (i=0; i  size; i++) {
-   printf(%c, buffer[i]);
-   }
-   printf(\n);
+   dump_data(buffer, size);
break;
case REG_MULTI_SZ:
+   dump_data(buffer, size);
p = (LPSTR)buffer;
while (p  *p) {
-   printf(%s\n, p);
+   printf(\t\t%s\n, p);
for (; *p; p = CharNext(p)) {
p = CharNext(p);
}
@@ -1197,18 +1241,48 @@ void print_printer_data(LPSTR keyname, LPSTR valuename, 
DWORD size, LPBYTE buffe
printf(\t\t0x%08x\n, (DWORD)*buffer);

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Matthias Dieter Wallnöfer 
The branch, master has been updated
   via  af6f594... s4:provision - use the new interface_ips python call 
to detect the right host IPv4 address
   via  8a8c2de... s4:ldif_handlers - Use unsigned int for counting 
purposes
  from  a319eb9... testprogs: add test_PrinterDataW.

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


- Log -
commit af6f59468ab157d125e14a649ee1d55bd17e8d1a
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 10:29:33 2010 +0100

s4:provision - use the new interface_ips python call to detect the right 
host IPv4 address

Inform the user when there are more possibilities (so he can check for the
right address and otherwise he is able to do an immediate reprovision) and 
no
possibility at all (then we fall back to the loopback address 127.0.0.1 - 
this
is thought for testing purposes).

I think this should be enough for closing bug #5484.

commit 8a8c2de29f95ac81e9899264cf86ebea22053782
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Fri Nov 6 20:14:41 2009 +0100

s4:ldif_handlers - Use unsigned int for counting purposes

I changed uint32_t to unsigned int since the LDB specification 
prescrives
unsigned (int) for counter variables (number of attributes,
number of values...).

---

Summary of changes:
 source4/lib/ldb-samba/ldif_handlers.c   |8 
 source4/scripting/python/samba/provision.py |   16 
 2 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb-samba/ldif_handlers.c 
b/source4/lib/ldb-samba/ldif_handlers.c
index effec46..b5a6630 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -594,7 +594,7 @@ static int ldif_write_prefixMap(struct ldb_context *ldb, 
void *mem_ctx,
struct prefixMapBlob *blob;
enum ndr_err_code ndr_err;
char *string;
-   uint32_t i;
+   unsigned int i;
 
if (ldb_get_flags(ldb)  LDB_FLG_SHOW_BINARY) {
int err;
@@ -1075,7 +1075,7 @@ static const struct {
 
 const struct ldb_schema_syntax *ldb_samba_syntax_by_name(struct ldb_context 
*ldb, const char *name)
 {
-   uint32_t j;
+   unsigned int j;
const struct ldb_schema_syntax *s = NULL;

for (j=0; j  ARRAY_SIZE(samba_syntaxes); j++) {
@@ -1089,7 +1089,7 @@ const struct ldb_schema_syntax 
*ldb_samba_syntax_by_name(struct ldb_context *ldb
 
 const struct ldb_schema_syntax *ldb_samba_syntax_by_lDAPDisplayName(struct 
ldb_context *ldb, const char *name)
 {
-   uint32_t j;
+   unsigned int j;
const struct ldb_schema_syntax *s = NULL;
 
for (j=0; j  ARRAY_SIZE(samba_attributes); j++) {
@@ -1107,7 +1107,7 @@ const struct ldb_schema_syntax 
*ldb_samba_syntax_by_lDAPDisplayName(struct ldb_c
 */
 int ldb_register_samba_handlers(struct ldb_context *ldb)
 {
-   uint32_t i;
+   unsigned int i;
 
for (i=0; i  ARRAY_SIZE(samba_attributes); i++) {
int ret;
diff --git a/source4/scripting/python/samba/provision.py 
b/source4/scripting/python/samba/provision.py
index 450881c..cb90141 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1182,14 +1182,14 @@ def provision(setup_dir, message, session_info,
 paths.bind_gid = bind_gid
 
 if hostip is None:
-try:
-for ip in socket.getaddrinfo(names.hostname, None, socket.AF_INET, 
socket.AI_CANONNAME, socket.IPPROTO_IP):
-if hostip is None:
-hostip = ip[-1][0]
-if hostip.startswith('127.0.0.') and (not 
ip[-1][0].startswith('127.0.0.')):
-hostip = ip[-1][0]
-except socket.gaierror, (socket.EAI_NODATA, msg):
-hostip = None
+hostips = glue.interface_ips(lp)
+if len(hostips) == 0:
+message(No external IPv4 address has been found: I use the 
loopback.)
+hostip = '127.0.0.1'
+else:
+hostip = hostips[0]
+if len(hostips)  1:
+message(More than one IPv4 address found: I use  + hostip + 
.)
 
 if hostip6 is None:
 try:


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Karolin Seeger 
The branch, master has been updated
   via  22d3169... s3:configure: add --enable-as-needed
  from  af6f594... s4:provision - use the new interface_ips python call 
to detect the right host IPv4 address

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


- Log -
commit 22d316926b9589608d332143c1fa134229b75b3c
Author: Stefan Metzmacher me...@sernet.private
Date:   Thu Mar 4 11:14:51 2010 +0100

s3:configure: add --enable-as-needed

On some broken systems like RHEL5, we need to be able
to disable --as-needed.

metze

---

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 7ba72bf..5283d8f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1746,7 +1746,12 @@ fi
 
 AC_MSG_RESULT($BLDSHARED)
 
-for flags in -Wl,--as-needed -Wl,-z,ignore -z ignore ; do
+AC_ARG_ENABLE(as-needed,
+ [AS_HELP_STRING([--enable-as-needed],
+ [Turn on as-needed support if available (default=yes)])])
+
+if test x$enable_as_needed != xno; then
+for flags in -Wl,--as-needed -Wl,-z,ignore -z ignore ; do
saved_ldflags=$LDFLAGS
AC_MSG_CHECKING([if $flags works])
LDFLAGS=$flags $saved_ldflags
@@ -1757,7 +1762,8 @@ for flags in -Wl,--as-needed -Wl,-z,ignore -z 
ignore ; do
AC_MSG_RESULT([no]))
LDFLAGS=$LD_AS_NEEDED_FLAG $saved_ldflags
test x$ld_as_needed_flag_found = xyes  break
-done
+done
+fi
 
 # for historical reasons almost all linkers don't complain about unresolved
 # symbols in shared libs. Except for the internal samba modules we want to get


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Nadezhda Ivanova 
The branch, master has been updated
   via  8cb416a... Refactored ACL python tests
  from  22d3169... s3:configure: add --enable-as-needed

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


- Log -
commit 8cb416a0b569017e1928a7a1cead723ce64ca314
Author: Nadezhda Ivanova nadezhda.ivan...@postpath.com
Date:   Thu Mar 4 15:22:30 2010 +0200

Refactored ACL python tests

Made each type into a separate class to be easily run individually,
removed code duplication

---

Summary of changes:
 source4/lib/ldb/tests/python/acl.py |  697 +--
 1 files changed, 256 insertions(+), 441 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tests/python/acl.py 
b/source4/lib/ldb/tests/python/acl.py
index 05c3510..083c7ae 100755
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-# This is unit with PPD tests
+# This is unit with tests for LDAP access checks
 
 import getopt
 import optparse
@@ -13,12 +13,10 @@ sys.path.append(bin/python)
 
 import samba.getopt as options
 
-# Some error messages that are being tested
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
 from ldb import ERR_NO_SUCH_OBJECT, ERR_INVALID_DN_SYNTAX, 
ERR_UNWILLING_TO_PERFORM
 from ldb import ERR_INSUFFICIENT_ACCESS_RIGHTS
 
-# For running the test unit
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security
 
@@ -72,6 +70,7 @@ class AclTests(unittest.TestCase):
 self.ldb_admin = ldb
 self.base_dn = self.find_basedn(self.ldb_admin)
 self.domain_sid = self.find_domain_sid(self.ldb_admin)
+self.user_pass = samba123@
 print baseDN: %s % self.base_dn
 self.SAMBA = False; self.WIN = False
 res = self.ldb_admin.search(base=,expression=, scope=SCOPE_BASE,
@@ -80,54 +79,6 @@ class AclTests(unittest.TestCase):
 self.SAMBA = True
 else:
 self.WIN = True
-if self.WIN:
-# Modify acluser1  acluser2 to be excluded from 'Doamin Admin' 
group
-try:
-ldif = 
-dn: CN=Domain Admins,CN=Users, + self.base_dn + 
-changetype: modify
-delete: member
-member:  + self.get_user_dn(acluser1)
-self.ldb_admin.modify_ldif(ldif)
-ldif = 
-dn: CN=Domain Admins,CN=Users, + self.base_dn + 
-changetype: modify
-delete: member
-member:  + self.get_user_dn(acluser2)
-self.ldb_admin.modify_ldif(ldif)
-except LdbError, (num, _):
-self.assertEquals(num, ERR_UNWILLING_TO_PERFORM) # 
LDAP_ENTRY_ALREADY_EXISTS
-
-def tearDown(self):
-# Add
-self.delete_force(self.ldb_admin, 
CN=test_add_user1,OU=test_add_ou2,OU=test_add_ou1, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_add_group1,OU=test_add_ou2,OU=test_add_ou1, + self.base_dn)
-self.delete_force(self.ldb_admin, OU=test_add_ou2,OU=test_add_ou1, + 
self.base_dn)
-self.delete_force(self.ldb_admin, OU=test_add_ou1, + self.base_dn)
-# Modify
-self.delete_force(self.ldb_admin, 
self.get_user_dn(test_modify_user1))
-self.delete_force(self.ldb_admin, CN=test_modify_group1,CN=Users, + 
self.base_dn)
-self.delete_force(self.ldb_admin, OU=test_modify_ou1, + self.base_dn)
-# Search
-self.delete_force(self.ldb_admin, 
CN=test_search_user1,OU=test_search_ou1, + self.base_dn)
-self.delete_force(self.ldb_admin, OU=test_search_ou1, + self.base_dn)
-# Delete
-self.delete_force(self.ldb_admin, 
self.get_user_dn(test_delete_user1))
-# Rename OU3
-self.delete_force(self.ldb_admin, 
CN=test_rename_user1,OU=test_rename_ou3,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_rename_user2,OU=test_rename_ou3,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_rename_user5,OU=test_rename_ou3,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, 
OU=test_rename_ou3,OU=test_rename_ou2, + self.base_dn)
-# Rename OU2
-self.delete_force(self.ldb_admin, 
CN=test_rename_user1,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_rename_user2,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_rename_user5,OU=test_rename_ou2, + self.base_dn)
-self.delete_force(self.ldb_admin, OU=test_rename_ou2, + self.base_dn)
-# Rename OU1
-self.delete_force(self.ldb_admin, 
CN=test_rename_user1,OU=test_rename_ou1, + self.base_dn)
-self.delete_force(self.ldb_admin, 
CN=test_rename_user2,OU=test_rename_ou1, + self.base_dn)
-self.delete_force(self.ldb_admin,

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Karolin Seeger 
The branch, master has been updated
   via  bc2ff7a... Revert s3:configure: add --enable-as-needed
  from  8cb416a... Refactored ACL python tests

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


- Log -
commit bc2ff7abc9c2b8c7c295e7164a02ef6820ebdae0
Author: Karolin Seeger ksee...@samba.org
Date:   Thu Mar 4 16:18:44 2010 +0100

Revert s3:configure: add --enable-as-needed

This reverts commit 22d316926b9589608d332143c1fa134229b75b3c.

Please see bug #7209 for details.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 5283d8f..7ba72bf 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1746,12 +1746,7 @@ fi
 
 AC_MSG_RESULT($BLDSHARED)
 
-AC_ARG_ENABLE(as-needed,
- [AS_HELP_STRING([--enable-as-needed],
- [Turn on as-needed support if available (default=yes)])])
-
-if test x$enable_as_needed != xno; then
-for flags in -Wl,--as-needed -Wl,-z,ignore -z ignore ; do
+for flags in -Wl,--as-needed -Wl,-z,ignore -z ignore ; do
saved_ldflags=$LDFLAGS
AC_MSG_CHECKING([if $flags works])
LDFLAGS=$flags $saved_ldflags
@@ -1762,8 +1757,7 @@ if test x$enable_as_needed != xno; then
AC_MSG_RESULT([no]))
LDFLAGS=$LD_AS_NEEDED_FLAG $saved_ldflags
test x$ld_as_needed_flag_found = xyes  break
-done
-fi
+done
 
 # for historical reasons almost all linkers don't complain about unresolved
 # symbols in shared libs. Except for the internal samba modules we want to get


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Matthias Dieter Wallnöfer 
The branch, master has been updated
   via  3d94b28... s4:ldap.py - give the primaryGroupToken test a better 
name
   via  4546b6b... s4:ldap.py - add test for tokenGroups
   via  8297302... s4:operational LDB - don't accidentally ate search 
helper attributes if we need them for more constructed attributes
   via  ffa0382... s4:operational LDB module - make the counters unsigned
   via  bf94d68... s4:operational LDB - implement the tokenGroups 
constructed attribute
   via  1f371cd... s4:sam.c - make authsam_expand_nested_groups public
   via  7587665... s4:sam.c - cosmetic indentation fix
   via  0049c9e... s4:sam.c - change variable types to unsigned in 
sids_contains_sid
   via  e34ee26... s4:operational LDB module - use right memory context int 
construct_primary_group_token
  from  bc2ff7a... Revert s3:configure: add --enable-as-needed

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


- Log -
commit 3d94b284411d912449b6a316439cc3d013bf1570
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 17:54:45 2010 +0100

s4:ldap.py - give the primaryGroupToken test a better name

It tests also some other constructed attributes in a basic way.

commit 4546b6b7dfd7f0e59e11b63c6cf91a4594b8ca54
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 17:51:09 2010 +0100

s4:ldap.py - add test for tokenGroups

commit 8297302e989c62092b50a275207046e83cd52800
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 16:28:03 2010 +0100

s4:operational LDB - don't accidentally ate search helper attributes if 
we need them for more constructed attributes

With this patch we delete the helper attributes at the end where all 
constructed
attributes have already been computed.

commit ffa03820f1352779988f7cf19190ef6ec2eae33d
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 15:44:10 2010 +0100

s4:operational LDB module - make the counters unsigned

No need to have signed counters here.

commit bf94d68df82f3c7085a6e468b4247fa55d4648ba
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 13:58:16 2010 +0100

s4:operational LDB - implement the tokenGroups constructed attribute

It contains the transitive SID closure (expand member/memberOf attributes) 
of a
certain SAM object. The tokenGroups attribute never contains the SID of 
the
object itself.

References: http://msdn.microsoft.com/en-us/library/ms680275(VS.85).aspx,
http://support.microsoft.com/kb/301916,
MS-ADTS 3.1.1.4.5.19.

commit 1f371cdbe5a5c2f02ca82a492530fc00b67960d4
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 13:49:18 2010 +0100

s4:sam.c - make authsam_expand_nested_groups public

This is needed by the tokenGroups work in the operational LDB module.

commit 7587665d928b3297259950ccad0947c192360765
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 13:48:17 2010 +0100

s4:sam.c - cosmetic indentation fix

commit 0049c9ed1c0585b81eeaddd2770e545409b307ed
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 13:46:34 2010 +0100

s4:sam.c - change variable types to unsigned in sids_contains_sid

Should also be unsigned - no need for a signed i and num_sids here.

commit e34ee26169a893e4219e49803885718261faf82b
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 14:28:04 2010 +0100

s4:operational LDB module - use right memory context int 
construct_primary_group_token

Use the msg as temporary context and not ldb which lives much longer.

---

Summary of changes:
 source4/auth/auth.h  |6 ++
 source4/auth/sam.c   |   12 ++--
 source4/dsdb/samdb/ldb_modules/config.mk |2 +-
 source4/dsdb/samdb/ldb_modules/operational.c |  123 +++--
 source4/lib/ldb/tests/python/ldap.py |   50 ++-
 5 files changed, 173 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index b0a907f..bbdbbc3 100644
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -237,6 +237,12 @@ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
bool allow_domain_trust,
bool password_change);
 struct auth_session_info *system_session(struct loadparm_context *lp_ctx);
+NTSTATUS authsam_expand_nested_groups(struct ldb_context *sam_ctx,
+ const struct dom_sid *sid,
+ const bool only_childs,
+ TALLOC_CTX *res_sids_ctx,
+ struct dom_sid ***res_sids,
+

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Matthias Dieter Wallnöfer 
The branch, master has been updated
   via  13b1bf5... s4:auth/sam.c - change base context for the tmp_ctx 
context in authsam_expand_nested_groups
  from  3d94b28... s4:ldap.py - give the primaryGroupToken test a better 
name

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


- Log -
commit 13b1bf5d47cb764365f6a14e35a4aa55b9a7e355
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date:   Thu Mar 4 22:18:10 2010 +0100

s4:auth/sam.c - change base context for the tmp_ctx context in 
authsam_expand_nested_groups

Better use the res_sids_ctx as base context for the tmp_ctx and not the
long-living sam_ctx/ldb context to prevent memory leaks.

---

Summary of changes:
 source4/auth/sam.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 20efc36..fc3e810 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -336,7 +336,7 @@ _PUBLIC_ NTSTATUS authsam_expand_nested_groups(struct 
ldb_context *sam_ctx,
++(*num_res_sids);
}
 
-   tmp_ctx = talloc_new(sam_ctx);
+   tmp_ctx = talloc_new(res_sids_ctx);
 
ret = gendb_search(sam_ctx, tmp_ctx, NULL, res, attrs,
objectSid=%s, ldap_encode_ndr_dom_sid(tmp_ctx, sid));


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Jeremy Allison 
The branch, master has been updated
   via  cb06eee... srv_pipe.c doesn't reference current_user anymore. 
Remove it.
  from  13b1bf5... s4:auth/sam.c - change base context for the tmp_ctx 
context in authsam_expand_nested_groups

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


- Log -
commit cb06eee86af1839996e9298ad4612d4a4f7865cc
Author: Jeremy Allison j...@samba.org
Date:   Thu Mar 4 14:59:29 2010 -0800

srv_pipe.c doesn't reference current_user anymore. Remove it.

Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index d65f52e..f6ed50c 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -33,8 +33,6 @@
 #include ../libcli/auth/spnego.h
 #include ntlmssp.h
 
-extern struct current_user current_user;
-
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Andrew Tridgell 
The branch, master has been updated
   via  25a0750... s4-python: only install external python libs that are 
missing
   via  7d86257... s4-python: import a copy of the python dns library
   via  f3ca7a4... s4-dns: use samba.external to pull in the dns.resolver 
library
   via  8c7cf49... s4-python: allow us to have samba copies of python 
libraries we depend on
   via  2d30f4f... s4-dns-ex: use autoclose on the dns child pipe
   via  5573d04... s4-messaging: use auto-close on the socket
  from  cb06eee... srv_pipe.c doesn't reference current_user anymore. 
Remove it.

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


- Log -
commit 25a0750b8184e434e30717bb47f0b36a00e41629
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 11:53:19 2010 +1100

s4-python: only install external python libs that are missing

commit 7d86257d54cb59d016a051b91bdee62ab2f8a0d5
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 11:45:40 2010 +1100

s4-python: import a copy of the python dns library

This library is not installed on enough systems for us to rely
on it being available. We use the system copy if possible, and
fallback to this local copy

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit f3ca7a4696cadbb74f41dd71ef9336445682d406
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 11:45:10 2010 +1100

s4-dns: use samba.external to pull in the dns.resolver library

commit 8c7cf499abf880cd4915e1b831298feb8990245b
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 11:44:45 2010 +1100

s4-python: allow us to have samba copies of python libraries we depend on

For python libraries like dns.resolver it is useful to be able to install
a copy of the library with Samba. This set of functions allows us to do that
while using the locally installed version if it is available

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit 2d30f4fb4fd39fb0949cd948559725917f95742f
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 10:43:34 2010 +1100

s4-dns-ex: use autoclose on the dns child pipe

I'm hoping this will fix an occasional segfault I've noticed where
epoll still calls events on a closed fde

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit 5573d049414d75e9991d53627235cafefbe67470
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 10:42:41 2010 +1100

s4-messaging: use auto-close on the socket

---

Summary of changes:
 source4/lib/messaging/messaging.c  |1 +
 source4/libcli/resolve/dns_ex.c|3 +-
 source4/script/installmisc.sh  |   10 +
 source4/scripting/bin/samba_dnsupdate  |8 +-
 source4/scripting/python/samba/external.py |   50 +
 source4/scripting/python/samba_external/README |4 +
 .../python/samba_external/dnspython/ChangeLog  | 1023 ++
 .../python/samba_external/dnspython/LICENSE|   14 +
 .../python/samba_external/dnspython/PKG-INFO   |   28 +
 .../python/samba_external/dnspython/README |  347 +++
 .../scripting/python/samba_external/dnspython/TODO |   17 +
 .../samba_external/dnspython/dns/__init__.py   |   52 +
 .../python/samba_external/dnspython/dns/dnssec.py  |   72 ++
 .../python/samba_external/dnspython/dns/e164.py|   79 ++
 .../python/samba_external/dnspython/dns/edns.py|  142 +++
 .../python/samba_external/dnspython/dns/entropy.py |  123 +++
 .../samba_external/dnspython/dns/exception.py  |   40 +
 .../python/samba_external/dnspython/dns/flags.py   |  106 ++
 .../python/samba_external/dnspython/dns/inet.py|  108 ++
 .../python/samba_external/dnspython/dns/ipv4.py|   36 +
 .../python/samba_external/dnspython/dns/ipv6.py|  163 +++
 .../python/samba_external/dnspython/dns/message.py | 1083 
 .../python/samba_external/dnspython/dns/name.py|  700 +
 .../samba_external/dnspython/dns/namedict.py   |   59 ++
 .../python/samba_external/dnspython/dns/node.py|  172 
 .../python/samba_external/dnspython/dns/opcode.py  |  104 ++
 .../python/samba_external/dnspython/dns/query.py   |  428 
 .../python/samba_external/dnspython/dns/rcode.py   |  119 +++
 .../python/samba_external/dnspython/dns/rdata.py   |  456 
 .../samba_external/dnspython/dns/rdataclass.py |  114 ++
 .../samba_external/dnspython/dns/rdataset.py   |  329 ++
 .../samba_external/dnspython/dns/rdatatype.py  |  232 +
 .../dnspython/dns/rdtypes/ANY/AFSDB.py |   51 +
 .../dnspython/dns/rdtypes/ANY/CERT.py  |  131 +++
 .../dnspython/dns/rdtypes/ANY/CNAME.py |   24 +
 .../dnspython/dns/rdtypes/ANY/DLV.py   |   20 +

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Bo Yang 
The branch, master has been updated
   via  aaafadb... s3: Fix unnecessary traversing winbindd_cache.tdb in 
SIGHUP handler.
  from  25a0750... s4-python: only install external python libs that are 
missing

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


- Log -
commit aaafadb7d5a835f88fce3fbea8127d9c5ddb7181
Author: Bo Yang boy...@samba.org
Date:   Sat Mar 6 20:58:23 2010 +0800

s3: Fix unnecessary traversing winbindd_cache.tdb in SIGHUP handler.

Signed-off-by: Bo Yang boy...@samba.org

---

Summary of changes:
 source3/winbindd/winbindd_cache.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c 
b/source3/winbindd/winbindd_cache.c
index 0e17253..db2f3b6 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -3042,6 +3042,12 @@ bool wcache_invalidate_cache_noinit(void)
if (cache) {
if (cache-tdb) {
tdb_traverse(cache-tdb, traverse_fn, NULL);
+   /*
+* Flushing cache has nothing to with domains.
+* return here if we successfully flushed once.
+* To avoid unnecessary traversing the cache.
+*/
+   return true;
} else {
return false;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-03-04 Thread Andrew Tridgell 
The branch, master has been updated
   via  2e16378... s4-pvfs: log more error conditions in NTVFS backend
   via  80a37be... s4-pvfs: move the private ntcreatex flags to 
private_flags
   via  f01f124... s4-rpc: don't use s-credentials after it is freed
   via  2e1e446... s4-torture: fixed commas separating C statements
  from  aaafadb... s3: Fix unnecessary traversing winbindd_cache.tdb in 
SIGHUP handler.

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


- Log -
commit 2e1637833bb5e1d5c44b10761a8f6bbd88bde32d
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 14:59:08 2010 +1100

s4-pvfs: log more error conditions in NTVFS backend

This should make is easier to track down some bug reports

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

commit 80a37beb53519fdbb907a01f29ef150bafdd74e7
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 14:57:50 2010 +1100

s4-pvfs: move the private ntcreatex flags to private_flags

Re-using two of the create_options bits was bound to eventually
cause problems, and indeed, Windows7 now uses one of those bits
when opening text files.

Fixes bug 7189

commit f01f124969b3e75accfc82fb85487fdab2046e82
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 13:49:49 2010 +1100

s4-rpc: don't use s-credentials after it is freed

commit 2e1e446ba3f9fd177a29876a9d7173d11b334f40
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 5 13:02:16 2010 +1100

s4-torture: fixed commas separating C statements

---

Summary of changes:
 source4/libcli/raw/interfaces.h  |3 +++
 source4/libcli/raw/smb.h |   12 
 source4/librpc/rpc/dcerpc_schannel.c |3 +--
 source4/ntvfs/ntvfs_generic.c|6 --
 source4/ntvfs/posix/pvfs_open.c  |   30 ++
 source4/ntvfs/posix/pvfs_read.c  |1 +
 source4/ntvfs/posix/pvfs_rename.c|   10 ++
 source4/ntvfs/posix/vfs_posix.h  |2 ++
 source4/smb_server/smb/nttrans.c |1 +
 source4/smb_server/smb/reply.c   |7 +--
 source4/torture/rpc/handles.c|7 +++
 11 files changed, 56 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index f159074..f6d0905 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -1439,6 +1439,9 @@ union smb_open {

/* some optional parameters from the SMB2 varient */
bool query_maximal_access;
+
+   /* private flags for internal use only */
+   uint8_t private_flags;
} in;
struct {
union smb_handle file;
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 349705d..7291821 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -178,19 +178,15 @@
 #define NTCREATEX_OPTIONS_INVALID_PARAM_MASK(NTCREATEX_OPTIONS_OPFILTER | \
 NTCREATEX_OPTIONS_SYNC_ALERT | 
\
 NTCREATEX_OPTIONS_ASYNC_ALERT 
| \
-NTCREATEX_OPTIONS_OPFILTER | \
 0xFF00)
 
 /*
- * We reuse some ignored flags for private use.
+ * private_flags field in ntcreatex
  * This values have different meaning for some ntvfs backends.
- *
- * TODO: use values that are ignore for sure...
  */
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS  0x0001
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB  0x0002
-#define NTCREATEX_OPTIONS_PRIVATE_MASK  
(NTCREATEX_OPTIONS_PRIVATE_DENY_DOS | \
-
NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS  0x0001
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB  0x0002
+
 
 /* ntcreatex impersonation field */
 #define NTCREATEX_IMPERSONATION_ANONYMOUS  0
diff --git a/source4/librpc/rpc/dcerpc_schannel.c 
b/source4/librpc/rpc/dcerpc_schannel.c
index 0870c89..4927e20 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -315,8 +315,7 @@ static void continue_schannel_key(struct composite_context 
*ctx)
/* receive schannel key */
c-status = dcerpc_schannel_key_recv(ctx);
if (!composite_is_ok(c)) {
-   DEBUG(1, (Failed to setup credentials for account %s: %s\n,
- cli_credentials_get_username(s-credentials), 
nt_errstr(c-status)));
+   DEBUG(1, (Failed to setup credentials: %s\n, 
nt_errstr(c-status)));
return;
}
 
diff --git

Build status as of Fri Mar 5 07:00:08 2010

2010-03-04 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2010-03-04 
00:00:27.0 -0700
+++ /home/build/master/cache/broken_results.txt 2010-03-05 00:00:53.0 
-0700
@@ -1,9 +1,9 @@
-Build status as of Thu Mar  4 07:00:08 2010
+Build status as of Fri Mar  5 07:00:08 2010
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   35 13 0 
+ccache   35 12 0 
 ldb  35 34 0 
 libreplace   35 12 0 
 lorikeet 0  0  0