Build status as of Sat Jun 14 00:00:03 2008

2008-06-13 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2008-06-13 
00:00:28.0 +
+++ /home/build/master/cache/broken_results.txt 2008-06-14 00:00:44.0 
+
@@ -1,4 +1,4 @@
-Build status as of Fri Jun 13 00:00:02 2008
+Build status as of Sat Jun 14 00:00:03 2008
 
 Build counts:
 Tree Total  Broken Panic 
@@ -6,7 +6,7 @@
 ccache   34 8  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  33 13 0 
+ldb  34 13 0 
 libreplace   33 11 0 
 lorikeet-heimdal 29 24 0 
 pidl 20 14 0 
@@ -15,7 +15,7 @@
 samba-docs   0  0  0 
 samba-gtk4  4  0 
 samba_3_2_test 34 22 0 
-samba_4_0_test 32 26 0 
+samba_4_0_test 32 27 0 
 smb-build32 4  0 
 talloc   34 7  0 
 tdb  34 13 0

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

2008-06-13 Thread Günther Deschner 
The branch, v3-3-test has been updated
   via  cf382a87602a63368587ffa2c95b774f2f97c21b (commit)
   via  94d45b1bb97ac2b6025d429389993ac43044f5b8 (commit)
   via  bcc6d3a0ebdcb904b5a2a4de63d9ed7415e9bb33 (commit)
   via  63ca4414b62657983c27d2930483aa56f9c78ccf (commit)
   via  bbfe5bcaf5ec5d06ffd110ab362ea3f228867603 (commit)
   via  9557504d70fe57098914da131b39212faf4f0a7d (commit)
   via  ae179e4f3faccbf2c9f19b6f070f5daf87cdfc50 (commit)
   via  e9b79f34d5afe10ee8d9b1e2dd19c8aafa533579 (commit)
   via  0707d32042b23d615b57b2f955775472b766770e (commit)
   via  b5a0e2d18f8d5c98326fefbda5972c02f898ed82 (commit)
  from  f30bc6503de6c712101e04fe26c004eeffcd300e (commit)

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


- Log -
commit cf382a87602a63368587ffa2c95b774f2f97c21b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 22:33:46 2008 +0200

net_vampire: rename process_database to samsync_process_database.

Guenther

commit 94d45b1bb97ac2b6025d429389993ac43044f5b8
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 21:57:32 2008 +0200

net_vampire: fix ldif_init_context().

Guenther

commit bcc6d3a0ebdcb904b5a2a4de63d9ed7415e9bb33
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 21:46:59 2008 +0200

net_vampire: split out rpc_vampire_ldif().

Guenther

commit 63ca4414b62657983c27d2930483aa56f9c78ccf
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 21:25:53 2008 +0200

net_vampire: add samsync_init_context().

Guenther

commit bbfe5bcaf5ec5d06ffd110ab362ea3f228867603
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 21:11:55 2008 +0200

net_vampire: add samsync_debug_str().

Guenther

commit 9557504d70fe57098914da131b39212faf4f0a7d
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Thu Jun 12 12:35:46 2008 +0200

net_vampire: restructure internal code more.

Guenther

commit ae179e4f3faccbf2c9f19b6f070f5daf87cdfc50
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jun 11 02:29:58 2008 +0200

net_vampire: start using talloc for the ldif vampire code.

Guenther

commit e9b79f34d5afe10ee8d9b1e2dd19c8aafa533579
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jun 11 01:46:58 2008 +0200

net_vampire: join dump and process function into one callback.

Guenther

commit 0707d32042b23d615b57b2f955775472b766770e
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jun 11 01:29:36 2008 +0200

net_vampire: let fetch_database and fetch_database_to_ldif use sid pointers.

Guenther

commit b5a0e2d18f8d5c98326fefbda5972c02f898ed82
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Wed Jun 11 01:23:43 2008 +0200

net_vampire: let dump_database() return NTSTATUS.

Guenther

---

Summary of changes:
 source/utils/net.h |   42 ++-
 source/utils/net_proto.h   |9 +
 source/utils/net_rpc.c |   34 +-
 source/utils/net_rpc_samsync.c | 1197 +++-
 4 files changed, 773 insertions(+), 509 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net.h b/source/utils/net.h
index 65c8d75..627ac0a 100644
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -148,13 +148,43 @@ enum netdom_domain_t { ND_TYPE_NT4, ND_TYPE_AD };
 /* Structure for mapping accounts to groups */
 /* Array element is the group rid */
 typedef struct _groupmap {
-   uint32 rid;
-   uint32 gidNumber;
-   fstring sambaSID;
-   fstring group_dn;
+   uint32_t rid;
+   uint32_t gidNumber;
+   const char *sambaSID;
+   const char *group_dn;
 } GROUPMAP;
 
 typedef struct _accountmap {
-   uint32 rid;
-   fstring cn;
+   uint32_t rid;
+   const char *cn;
 } ACCOUNTMAP;
+
+enum net_samsync_mode {
+   NET_SAMSYNC_MODE_FETCH_PASSDB = 0,
+   NET_SAMSYNC_MODE_FETCH_LDIF = 1,
+   NET_SAMSYNC_MODE_DUMP = 2
+};
+
+struct samsync_ldif_context {
+   GROUPMAP *groupmap;
+   ACCOUNTMAP *accountmap;
+   bool initialized;
+   const char *add_template;
+   const char *mod_template;
+   char *add_name;
+   char *mod_name;
+   FILE *add_file;
+   FILE *mod_file;
+   FILE *ldif_file;
+   const char *suffix;
+   int num_alloced;
+};
+
+struct samsync_context {
+   enum net_samsync_mode mode;
+   const struct dom_sid *domain_sid;
+   const char *domain_sid_str;
+   const char *ldif_filename;
+
+   struct samsync_ldif_context *ldif;
+};
diff --git a/source/utils/net_proto.h b/source/utils/net_proto.h
index fe3b864..a370d3d 100644
--- a/source/utils/net_proto.h
+++ b/source/utils/net_proto.h
@@ -359,6 +359,15 @@ NTSTATUS rpc_vampire_internals(struct net_context *c,

[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-68-g0e8f946

2008-06-13 Thread Jim McDonough 
The branch, v4-0-test has been updated
   via  0e8f946ed02a6d2d9469f9ccab5f3342b2b80725 (commit)
   via  74a0a9bb54b2583dde7a5fbadd4d10858de12ee7 (commit)
  from  cd4eddd31354f4ae45e8747da1a7034716c3 (commit)

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


- Log -
commit 0e8f946ed02a6d2d9469f9ccab5f3342b2b80725
Author: Jim McDonough <[EMAIL PROTECTED]>
Date:   Thu Jun 12 07:06:07 2008 -0400

Missed these on the last commit

commit 74a0a9bb54b2583dde7a5fbadd4d10858de12ee7
Author: Jim McDonough <[EMAIL PROTECTED]>
Date:   Thu Jun 12 07:02:14 2008 -0400

Initial automated wintest.

Added a blackbox test which looks for $WINTEST_CONF_DIR,
gets configuration vars from *.conf in that dir, disables
smbwrapper, and runs RAW-OPEN torture test.

Scripts are coming to startup/shutdown vm's.

---

Summary of changes:
 source/selftest/samba4_tests.sh |1 +
 testprogs/blackbox/test_wintest.sh  |   45 +++
 testprogs/blackbox/wintest/wintest.conf |7 +
 3 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100755 testprogs/blackbox/test_wintest.sh
 create mode 100644 testprogs/blackbox/wintest/wintest.conf


Changeset truncated at 500 lines:

diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 1d550cb..e9fbede 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -279,6 +279,7 @@ plantest "blackbox.masktest" dc $bbdir/test_masktest.sh 
"\$SERVER" "\$USERNAME"
 plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" 
"\$PASSWORD" "\$DOMAIN" "$PREFIX"
 plantest "blackbox.wbinfo" dc $bbdir/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" 
"\$PASSWORD" "dc"
 plantest "blackbox.wbinfo" member $bbdir/test_wbinfo.sh "\$DOMAIN" 
"\$DC_USERNAME" "\$DC_PASSWORD" "member"
+plantest "blackbox.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS"
 
 # Tests using the "Simple" NTVFS backend
 
diff --git a/testprogs/blackbox/test_wintest.sh 
b/testprogs/blackbox/test_wintest.sh
new file mode 100755
index 000..8bbe4f2
--- /dev/null
+++ b/testprogs/blackbox/test_wintest.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Blackbox tests for testing against windows machines
+# Copyright (C) 2008 Jim McDonough
+
+
+testwithconf() {
+# define test variables, startup/shutdown scripts
+. $1
+shift 1
+
+if [ -n "$WINTEST_STARTUP" ]; then
+. $WINTEST_STARTUP;
+fi
+
+testit "smbtorture" $smbtorture //$SERVER/$SHARE RAW-OPEN -W "$DOMAIN" 
-U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+if [ -n "$WINTEST_SHUTDOWN" ]; then
+. $WINTEST_SHUTDOWN;
+fi
+}
+
+
+# main
+# skip without WINTEST_CONF_DIR
+if [ -z "$WINTEST_CONF_DIR" ]; then
+exit 0;
+fi
+
+SOCKET_WRAPPER_DIR=
+export -n SOCKET_WRAPPER_DIR
+
+failed=0
+
+$basedir=`pwd`
+
+samba4bindir=`dirname $0`/../../source/bin
+smbtorture=$samba4bindir/smbtorture
+
+. `dirname $0`/subunit.sh
+
+for wintest_conf in $WINTEST_CONF_DIR/*.conf; do
+testwithconf "$wintest_conf" $@;
+done
+
+exit $failed
diff --git a/testprogs/blackbox/wintest/wintest.conf 
b/testprogs/blackbox/wintest/wintest.conf
new file mode 100644
index 000..d140366
--- /dev/null
+++ b/testprogs/blackbox/wintest/wintest.conf
@@ -0,0 +1,7 @@
+#export WINTEST_STARTUP="/tmp/startup client"
+#export WINTEST_SHUTDOWN=/tmp/shutdown client"
+export DOMAIN="client"
+export USERNAME="administrator"
+export PASSWORD="samba"
+export SERVER="192.168.213.161"
+export SHARE="c\$"
\ No newline at end of file


-- 
Samba Shared Repository

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

2008-06-13 Thread Karolin Seeger 
The branch, v3-2-test has been updated
   via  7c22fc6ebaa1a83213cbb7c08bea108264f89486 (commit)
  from  496d44d2f21661c85bf07e8eb7cae6298fefd900 (commit)

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


- Log -
commit 7c22fc6ebaa1a83213cbb7c08bea108264f89486
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Fri Jun 13 21:31:34 2008 +0200

net: Fix several typos in comments.

-argc -> argv (where argv is meant)
-destoyed -> destroyed
-compleation -> completion
-aquired -> acquired
-Unify spelling of some words like rpc-server -> RPC server.
-Add missing punctuation marks.

Karolin

---

Summary of changes:
 source/utils/net_rpc.c |  744 
 1 files changed, 372 insertions(+), 372 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index a271f55..9ff3baf 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -99,10 +99,10 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, 
TALLOC_CTX *mem_ctx,
  * @param pipe_name the pipe to connect to (usually a PIPE_ constant)
  * @param conn_flag a NET_FLAG_ combination.  Passed to 
  *   net_make_ipc_connection.
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *  stripped
- * @return A shell status integer (0 for success)
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *  stripped.
+ * @return A shell status integer (0 for success).
  */
 
 int run_rpc_command(struct cli_state *cli_arg,
@@ -202,14 +202,14 @@ int run_rpc_command(struct cli_state *cli_arg,
  * Force a change of the trust acccount password.
  *
  * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through. 
+ * argc, argv which are passed through. 
  *
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *  stripped
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *  stripped.
  *
  * @return Normal NTSTATUS return.
  **/
@@ -229,11 +229,11 @@ static NTSTATUS rpc_changetrustpw_internals(const DOM_SID 
*domain_sid,
 /** 
  * Force a change of the trust acccount password.
  *
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *  stripped
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *  stripped.
  *
- * @return A shell status integer (0 for success)
+ * @return A shell status integer (0 for success).
  **/
 
 int net_rpc_changetrustpw(int argc, const char **argv) 
@@ -251,14 +251,14 @@ int net_rpc_changetrustpw(int argc, const char **argv)
  * The password should be created with 'server manager' or equiv first.
  *
  * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through. 
+ * argc, argv which are passed through. 
  *
- * @param domain_sid The domain sid aquired from the remote server
+ * @param domain_sid The domain sid acquired from the remote server.
  * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on compleation of the function.
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *  stripped
+ * @param mem_ctx Talloc context, destroyed on completion of the function.
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *  stripped.
  *
  * @return Normal NTSTATUS return.
  **/
@@ -327,9 +327,9 @@ static NTSTATUS rpc_oldjoin_internals(const DOM_SID 
*domain_sid,
 /** 
  * Join a domain, the old way.
  *
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *  stripped
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *  stripped.
  *
  * @return A shell status integer (0 for success)
  **/
@@ -345,11 +345,11 @@ static int net_rpc_perform_oldjoin(int arg

[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-38-g1ad5cd9

2008-06-13 Thread Jeremy Allison 
The branch, v3-0-test has been updated
   via  1ad5cd93e69d8b82a71690d16df7e5cb2078bb65 (commit)
  from  3fa483a54d68fcebb204f532eaff01e1dff19f76 (commit)

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


- Log -
commit 1ad5cd93e69d8b82a71690d16df7e5cb2078bb65
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Fri Jun 13 09:43:34 2008 -0700

We should use set_domain_offline(domain) function instead of just set staus 
to offline. Otherwise,
domain will never goes online again.
From Bo Yang <[EMAIL PROTECTED]>
Jeremy.

---

Summary of changes:
 source/nsswitch/winbindd_pam.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_pam.c b/source/nsswitch/winbindd_pam.c
index e5e55e6..42540a6 100644
--- a/source/nsswitch/winbindd_pam.c
+++ b/source/nsswitch/winbindd_pam.c
@@ -1379,7 +1379,11 @@ enum winbindd_result winbindd_dual_pam_auth(struct 
winbindd_domain *domain,
NT_STATUS_EQUAL(result, NT_STATUS_IO_TIMEOUT) ||
NT_STATUS_EQUAL(result, 
NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
DEBUG(10,("winbindd_dual_pam_auth_kerberos setting 
domain to offline\n"));
-   domain->online = False;
+   /* Use set_domain_offline() instead of
+* just set status offline, otherwise,
+* domain will never goes online again
+* --- BoYang */
+   set_domain_offline(domain);
}
 
/* there are quite some NT_STATUS errors where there is no


-- 
Samba Shared Repository

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

2008-06-13 Thread Volker Lendecke 
The branch, v3-3-test has been updated
   via  f30bc6503de6c712101e04fe26c004eeffcd300e (commit)
  from  7e07ec68f15908a998f83d615a1b4d1349935a54 (commit)

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


- Log -
commit f30bc6503de6c712101e04fe26c004eeffcd300e
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jun 13 16:05:31 2008 +0200

Fix a handle leak for error returns in ldb_try_load_dso

Coverity ID 464
(cherry picked from commit 496d44d2f21661c85bf07e8eb7cae6298fefd900)

---

Summary of changes:
 source/lib/ldb/common/ldb_modules.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/common/ldb_modules.c 
b/source/lib/ldb/common/ldb_modules.c
index 68c4535..d898f3d 100644
--- a/source/lib/ldb/common/ldb_modules.c
+++ b/source/lib/ldb/common/ldb_modules.c
@@ -206,6 +206,7 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char 
*name)
void *handle;
int (*init_fn) (void);
char *modulesdir;
+   int ret;
 
 #ifdef HAVE_DLOPEN
if (getenv("LD_LDB_MODULE_PATH") != NULL) {
@@ -234,12 +235,17 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char 
*name)
 
if (init_fn == NULL) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found 
in %s: %s\n", path, dlerror());
+   dlclose(handle);
return -1;
}
 
talloc_free(path);
 
-   return init_fn();
+   ret = init_fn();
+   if (ret == -1) {
+   dlclose(handle);
+   }
+   return ret;
 #else
ldb_debug(ldb, LDB_DEBUG_TRACE, "no dlopen() - not trying to load %s 
module\n", name);
return -1;


-- 
Samba Shared Repository

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

2008-06-13 Thread Volker Lendecke 
The branch, v3-2-test has been updated
   via  496d44d2f21661c85bf07e8eb7cae6298fefd900 (commit)
  from  999533c0ccced59141d8baff5bc248d63e2a966f (commit)

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


- Log -
commit 496d44d2f21661c85bf07e8eb7cae6298fefd900
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jun 13 16:05:31 2008 +0200

Fix a handle leak for error returns in ldb_try_load_dso

Coverity ID 464

---

Summary of changes:
 source/lib/ldb/common/ldb_modules.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/ldb/common/ldb_modules.c 
b/source/lib/ldb/common/ldb_modules.c
index 68c4535..d898f3d 100644
--- a/source/lib/ldb/common/ldb_modules.c
+++ b/source/lib/ldb/common/ldb_modules.c
@@ -206,6 +206,7 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char 
*name)
void *handle;
int (*init_fn) (void);
char *modulesdir;
+   int ret;
 
 #ifdef HAVE_DLOPEN
if (getenv("LD_LDB_MODULE_PATH") != NULL) {
@@ -234,12 +235,17 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char 
*name)
 
if (init_fn == NULL) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found 
in %s: %s\n", path, dlerror());
+   dlclose(handle);
return -1;
}
 
talloc_free(path);
 
-   return init_fn();
+   ret = init_fn();
+   if (ret == -1) {
+   dlclose(handle);
+   }
+   return ret;
 #else
ldb_debug(ldb, LDB_DEBUG_TRACE, "no dlopen() - not trying to load %s 
module\n", name);
return -1;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-16-g9b52e70

2008-06-13 Thread Karolin Seeger 
The branch, v3-2-stable has been updated
   via  9b52e702d96a552f68e1af451ccdaf052b8c49a1 (commit)
  from  f2042c94b8ab7fbbdaf7f7ca954a0b3e1b11b964 (commit)

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


- Log -
commit 9b52e702d96a552f68e1af451ccdaf052b8c49a1
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jun 13 15:30:08 2008 +0200

Fix a crash in _winreg_QueryValue

Coverity ID 474, value_length and type are both unique, not ref pointers and
can thus be NULL.

Karolin, please merge this to -stable.

Thanks,

Volker
(cherry picked from commit 999533c0ccced59141d8baff5bc248d63e2a966f)

---

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


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_winreg_nt.c 
b/source/rpc_server/srv_winreg_nt.c
index 7b74871..84bcf0b 100644
--- a/source/rpc_server/srv_winreg_nt.c
+++ b/source/rpc_server/srv_winreg_nt.c
@@ -230,6 +230,10 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct 
winreg_QueryValue *r)
if ( !regkey )
return WERR_BADFID;
 
+   if ((r->out.value_length == NULL) || (r->out.type == NULL)) {
+   return WERR_INVALID_PARAM;
+   }
+
*r->out.value_length = *r->out.type = REG_NONE;

DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));


-- 
Samba Shared Repository

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

2008-06-13 Thread Volker Lendecke 
The branch, v3-3-test has been updated
   via  7e07ec68f15908a998f83d615a1b4d1349935a54 (commit)
  from  6c1904f8be1b4e08b09b64052c1aba24e7a4fb3d (commit)

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


- Log -
commit 7e07ec68f15908a998f83d615a1b4d1349935a54
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jun 13 15:30:08 2008 +0200

Fix a crash in _winreg_QueryValue

Coverity ID 474, value_length and type are both unique, not ref pointers and
can thus be NULL.

Karolin, please merge this to -stable.

Thanks,

Volker
(cherry picked from commit 999533c0ccced59141d8baff5bc248d63e2a966f)

---

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


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_winreg_nt.c 
b/source/rpc_server/srv_winreg_nt.c
index 7b74871..84bcf0b 100644
--- a/source/rpc_server/srv_winreg_nt.c
+++ b/source/rpc_server/srv_winreg_nt.c
@@ -230,6 +230,10 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct 
winreg_QueryValue *r)
if ( !regkey )
return WERR_BADFID;
 
+   if ((r->out.value_length == NULL) || (r->out.type == NULL)) {
+   return WERR_INVALID_PARAM;
+   }
+
*r->out.value_length = *r->out.type = REG_NONE;

DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));


-- 
Samba Shared Repository

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

2008-06-13 Thread Volker Lendecke 
The branch, v3-2-test has been updated
   via  999533c0ccced59141d8baff5bc248d63e2a966f (commit)
  from  1a22e975dd1255f3557c1cd873d877aa35822afc (commit)

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


- Log -
commit 999533c0ccced59141d8baff5bc248d63e2a966f
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jun 13 15:30:08 2008 +0200

Fix a crash in _winreg_QueryValue

Coverity ID 474, value_length and type are both unique, not ref pointers and
can thus be NULL.

Karolin, please merge this to -stable.

Thanks,

Volker

---

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


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_winreg_nt.c 
b/source/rpc_server/srv_winreg_nt.c
index 7b74871..84bcf0b 100644
--- a/source/rpc_server/srv_winreg_nt.c
+++ b/source/rpc_server/srv_winreg_nt.c
@@ -230,6 +230,10 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct 
winreg_QueryValue *r)
if ( !regkey )
return WERR_BADFID;
 
+   if ((r->out.value_length == NULL) || (r->out.type == NULL)) {
+   return WERR_INVALID_PARAM;
+   }
+
*r->out.value_length = *r->out.type = REG_NONE;

DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-15-gf2042c9

2008-06-13 Thread Karolin Seeger 
The branch, v3-2-stable has been updated
   via  f2042c94b8ab7fbbdaf7f7ca954a0b3e1b11b964 (commit)
   via  eae0effad439c1e3735e11261aee26d0a43c96ea (commit)
  from  8a5144dfb59f670494a2bd34cf2cafc9c816715e (commit)

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


- Log -
commit f2042c94b8ab7fbbdaf7f7ca954a0b3e1b11b964
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 12:20:01 2008 +0200

net: Fix bug #5542 (samsync contains empty passwords).

Guenther
(cherry picked from commit 1a22e975dd1255f3557c1cd873d877aa35822afc)

commit eae0effad439c1e3735e11261aee26d0a43c96ea
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 11:57:09 2008 +0200

samsync: add samsync_fix_delta_array()

This code is vastly based on samba4 code.

Guenther
(cherry picked from commit 5b68be96996a710988b1fd1c176cd5dff0f2c6af)

---

Summary of changes:
 source/Makefile.in |1 +
 source/libnet/libnet_samsync.c |  188 
 source/utils/net.h |1 +
 source/utils/net_ads.c |2 -
 source/utils/net_rpc_samsync.c |   27 ++
 5 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 source/libnet/libnet_samsync.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index cb72b94..04ff7cc 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -869,6 +869,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
  $(POPT_LIB_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
+libnet/libnet_samsync.o \
 librpc/gen_ndr/ndr_libnet_join.o
 
 NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
diff --git a/source/libnet/libnet_samsync.c b/source/libnet/libnet_samsync.c
new file mode 100644
index 000..e45a845
--- /dev/null
+++ b/source/libnet/libnet_samsync.c
@@ -0,0 +1,188 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Extract the user/system database from a remote SamSync server
+
+   Copyright (C) Andrew Bartlett <[EMAIL PROTECTED]> 2004-2005
+   Copyright (C) Guenther Deschner <[EMAIL PROTECTED]> 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+
+#include "includes.h"
+
+/**
+ * Decrypt and extract the user's passwords.
+ *
+ * The writes decrypted (no longer 'RID encrypted' or arcfour encrypted)
+ * passwords back into the structure
+ */
+
+static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
+DATA_BLOB *session_key,
+bool rid_crypt,
+enum netr_SamDatabaseID database_id,
+struct netr_DELTA_ENUM *delta)
+{
+
+   uint32_t rid = delta->delta_id_union.rid;
+   struct netr_DELTA_USER *user = delta->delta_union.user;
+   struct samr_Password lm_hash;
+   struct samr_Password nt_hash;
+   const char *username = user->account_name.string;
+
+   if (rid_crypt) {
+   if (user->lm_password_present) {
+   sam_pwd_hash(rid, user->lmpassword.hash, lm_hash.hash, 
0);
+   user->lmpassword = lm_hash;
+   }
+
+   if (user->nt_password_present) {
+   sam_pwd_hash(rid, user->ntpassword.hash, nt_hash.hash, 
0);
+   user->ntpassword = nt_hash;
+   }
+   }
+
+   if (user->user_private_info.SensitiveData) {
+   DATA_BLOB data;
+   struct netr_USER_KEYS keys;
+   enum ndr_err_code ndr_err;
+   data.data = user->user_private_info.SensitiveData;
+   data.length = user->user_private_info.DataLength;
+   SamOEMhashBlob(data.data, data.length, session_key);
+   user->user_private_info.SensitiveData = data.data;
+   user->user_private_info.DataLength = data.length;
+
+   ndr_err = ndr_pull_struct_blob(&data, mem_ctx, &keys,
+   (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   dump_data(10, data.data, data.length);
+   return ndr_map_error2ntstatus(ndr_err);
+   }
+
+   if (keys.keys.keys2.lmpas

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

2008-06-13 Thread Günther Deschner 
The branch, v3-3-test has been updated
   via  6c1904f8be1b4e08b09b64052c1aba24e7a4fb3d (commit)
   via  ad8392cf7c817ee29a03bc6f515bf1cc18a29eda (commit)
   via  2c53d87de4ecc5ac9c43bc7488a03bceecf35140 (commit)
  from  7f52998f5461ed7d976faa2254464336dcf73c02 (commit)

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


- Log -
commit 6c1904f8be1b4e08b09b64052c1aba24e7a4fb3d
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 12:30:36 2008 +0200

samsync: add prototype for samsync_fix_delta_array().

Guenther

commit ad8392cf7c817ee29a03bc6f515bf1cc18a29eda
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 12:20:01 2008 +0200

net: Fix bug #5542 (samsync contains empty passwords).

Guenther
(cherry picked from commit 1a22e975dd1255f3557c1cd873d877aa35822afc)

commit 2c53d87de4ecc5ac9c43bc7488a03bceecf35140
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 11:57:09 2008 +0200

samsync: add samsync_fix_delta_array()

This code is vastly based on samba4 code.

Guenther
(cherry picked from commit 5b68be96996a710988b1fd1c176cd5dff0f2c6af)

---

Summary of changes:
 source/Makefile.in |1 +
 source/libnet/libnet_proto.h   |8 ++
 source/libnet/libnet_samsync.c |  188 
 source/utils/net.h |1 +
 source/utils/net_ads.c |2 -
 source/utils/net_rpc_samsync.c |   27 ++
 6 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 source/libnet/libnet_samsync.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 917b0bf..3eb1142 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -892,6 +892,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
  $(POPT_LIB_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
+libnet/libnet_samsync.o \
 librpc/gen_ndr/ndr_libnet_join.o
 
 NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
diff --git a/source/libnet/libnet_proto.h b/source/libnet/libnet_proto.h
index 662ab7d..52382e9 100644
--- a/source/libnet/libnet_proto.h
+++ b/source/libnet/libnet_proto.h
@@ -43,4 +43,12 @@ WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx,
 _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char 
*name, int flags, const struct libnet_JoinCtx *r);
 _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char 
*name, int flags, const struct libnet_UnjoinCtx *r);
 
+/* The following definitions come from libnet/libnet_samsync.c  */
+
+NTSTATUS samsync_fix_delta_array(TALLOC_CTX *mem_ctx,
+DATA_BLOB *session_key,
+bool rid_crypt,
+enum netr_SamDatabaseID database_id,
+struct netr_DELTA_ENUM_ARRAY *r);
+
 #endif /*  _LIBNET_PROTO_H_  */
diff --git a/source/libnet/libnet_samsync.c b/source/libnet/libnet_samsync.c
new file mode 100644
index 000..e45a845
--- /dev/null
+++ b/source/libnet/libnet_samsync.c
@@ -0,0 +1,188 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Extract the user/system database from a remote SamSync server
+
+   Copyright (C) Andrew Bartlett <[EMAIL PROTECTED]> 2004-2005
+   Copyright (C) Guenther Deschner <[EMAIL PROTECTED]> 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+
+#include "includes.h"
+
+/**
+ * Decrypt and extract the user's passwords.
+ *
+ * The writes decrypted (no longer 'RID encrypted' or arcfour encrypted)
+ * passwords back into the structure
+ */
+
+static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
+DATA_BLOB *session_key,
+bool rid_crypt,
+enum netr_SamDatabaseID database_id,
+struct netr_DELTA_ENUM *delta)
+{
+
+   uint32_t rid = delta->delta_id_union.rid;
+   struct netr_DELTA_USER *user = delta->delta_union.user;
+   struct samr_Password lm_hash;
+   struct samr_Password nt_hash;
+   const char *username = user->account_name.string;
+
+   if (rid_crypt) {
+   if (user->lm_password_present) {
+   sam_pwd_hash(rid, user->lmpassword.h

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

2008-06-13 Thread Günther Deschner 
The branch, v3-2-test has been updated
   via  1a22e975dd1255f3557c1cd873d877aa35822afc (commit)
   via  5b68be96996a710988b1fd1c176cd5dff0f2c6af (commit)
  from  8800afafedccd43e425463045c05934d381e178d (commit)

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


- Log -
commit 1a22e975dd1255f3557c1cd873d877aa35822afc
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 12:20:01 2008 +0200

net: Fix bug #5542 (samsync contains empty passwords).

Guenther

commit 5b68be96996a710988b1fd1c176cd5dff0f2c6af
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Jun 13 11:57:09 2008 +0200

samsync: add samsync_fix_delta_array()

This code is vastly based on samba4 code.

Guenther

---

Summary of changes:
 source/Makefile.in |1 +
 source/libnet/libnet_samsync.c |  188 
 source/utils/net.h |1 +
 source/utils/net_ads.c |2 -
 source/utils/net_rpc_samsync.c |   27 ++
 5 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 source/libnet/libnet_samsync.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index cb72b94..04ff7cc 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -869,6 +869,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
  $(POPT_LIB_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
+libnet/libnet_samsync.o \
 librpc/gen_ndr/ndr_libnet_join.o
 
 NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
diff --git a/source/libnet/libnet_samsync.c b/source/libnet/libnet_samsync.c
new file mode 100644
index 000..e45a845
--- /dev/null
+++ b/source/libnet/libnet_samsync.c
@@ -0,0 +1,188 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Extract the user/system database from a remote SamSync server
+
+   Copyright (C) Andrew Bartlett <[EMAIL PROTECTED]> 2004-2005
+   Copyright (C) Guenther Deschner <[EMAIL PROTECTED]> 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+
+#include "includes.h"
+
+/**
+ * Decrypt and extract the user's passwords.
+ *
+ * The writes decrypted (no longer 'RID encrypted' or arcfour encrypted)
+ * passwords back into the structure
+ */
+
+static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
+DATA_BLOB *session_key,
+bool rid_crypt,
+enum netr_SamDatabaseID database_id,
+struct netr_DELTA_ENUM *delta)
+{
+
+   uint32_t rid = delta->delta_id_union.rid;
+   struct netr_DELTA_USER *user = delta->delta_union.user;
+   struct samr_Password lm_hash;
+   struct samr_Password nt_hash;
+   const char *username = user->account_name.string;
+
+   if (rid_crypt) {
+   if (user->lm_password_present) {
+   sam_pwd_hash(rid, user->lmpassword.hash, lm_hash.hash, 
0);
+   user->lmpassword = lm_hash;
+   }
+
+   if (user->nt_password_present) {
+   sam_pwd_hash(rid, user->ntpassword.hash, nt_hash.hash, 
0);
+   user->ntpassword = nt_hash;
+   }
+   }
+
+   if (user->user_private_info.SensitiveData) {
+   DATA_BLOB data;
+   struct netr_USER_KEYS keys;
+   enum ndr_err_code ndr_err;
+   data.data = user->user_private_info.SensitiveData;
+   data.length = user->user_private_info.DataLength;
+   SamOEMhashBlob(data.data, data.length, session_key);
+   user->user_private_info.SensitiveData = data.data;
+   user->user_private_info.DataLength = data.length;
+
+   ndr_err = ndr_pull_struct_blob(&data, mem_ctx, &keys,
+   (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   dump_data(10, data.data, data.length);
+   return ndr_map_error2ntstatus(ndr_err);
+   }
+
+   if (keys.keys.keys2.lmpassword.length == 16) {
+   if (rid_crypt) {
+   sam_pwd_hash(rid,
+