[SCM] Samba Shared Repository - branch master updated - 1c07c30d31b4b588b59b845bdb5f85a0ba19f762

2008-11-17 Thread Jelmer Vernooij 
The branch, master has been updated
   via  1c07c30d31b4b588b59b845bdb5f85a0ba19f762 (commit)
   via  ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a (commit)
  from  9ea794417e8bad3da4236f4071a0d8a23612ac8a (commit)

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


- Log -
commit 1c07c30d31b4b588b59b845bdb5f85a0ba19f762
Merge: ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a 
9ea794417e8bad3da4236f4071a0d8a23612ac8a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Tue Nov 18 01:36:02 2008 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Tue Nov 18 01:35:10 2008 +0100

Explicitly include samba4 includes.h to fix the build.

---

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


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 6b2a5b1..0ef5f61 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -18,7 +18,7 @@
along with this program.  If not, see .
 */
 
-#include "includes.h"
+#include "source4/include/includes.h"
 #include "../torture/torture.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"


-- 
Samba Shared Repository

Build status as of Tue Nov 18 00:00:02 2008

2008-11-17 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2008-11-17 
00:00:43.0 +
+++ /home/build/master/cache/broken_results.txt 2008-11-18 00:00:55.0 
+
@@ -1,22 +1,22 @@
-Build status as of Mon Nov 17 00:00:01 2008
+Build status as of Tue Nov 18 00:00:02 2008
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   33 7  0 
+ccache   33 8  0 
 ctdb 0  0  0 
 distcc   1  0  0 
 ldb  33 32 0 
-libreplace   31 13 0 
+libreplace   32 13 0 
 lorikeet-heimdal 29 20 0 
 pidl 19 2  0 
 ppp  13 13 0 
 rsync33 13 0 
 samba-docs   0  0  0 
 samba-gtk5  5  0 
-samba_3_X_devel 29 20 1 
-samba_3_X_test 29 17 0 
-samba_4_0_test 30 30 0 
+samba_3_X_devel 29 21 1 
+samba_3_X_test 29 19 0 
+samba_4_0_test 31 30 0 
 smb-build31 7  0 
 talloc   33 32 0 
 tdb  33 12 0

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

2008-11-17 Thread Jeremy Allison 
The branch, v3-2-test has been updated
   via  742ac5c45674446546b9e8ee22320a39d700b195 (commit)
  from  1daad740c6f0e3914b691b3e9c57aaf68ba0ca01 (commit)

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


- Log -
commit 742ac5c45674446546b9e8ee22320a39d700b195
Author: Davide Sfriso <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:40:43 2008 -0800

Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 
'getent group'.

---

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


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_passdb.c 
b/source/winbindd/winbindd_passdb.c
index 0cf4540..101854a 100644
--- a/source/winbindd/winbindd_passdb.c
+++ b/source/winbindd/winbindd_passdb.c
@@ -639,13 +639,13 @@ static NTSTATUS sam_lookup_groupmem(struct 
winbindd_domain *domain,
  sid_type_lookup(lsa_names[i].type)));
continue;
}
-   if (!((*names)[i] = talloc_strdup((*names),
+   if (!((*names)[num_mapped] = talloc_strdup((*names),
  lsa_names[i].name))) {
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
 
-   (*name_types)[i] = lsa_names[i].type;
+   (*name_types)[num_mapped] = lsa_names[i].type;
 
num_mapped += 1;
}


-- 
Samba Shared Repository

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

2008-11-17 Thread Jeremy Allison 
The branch, v3-3-test has been updated
   via  f4ebb87e39a3f5d1b76cfd2be86d56de9ae98ee9 (commit)
  from  37233a3f62f4b0e5d4fc3376687f445656bded41 (commit)

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


- Log -
commit f4ebb87e39a3f5d1b76cfd2be86d56de9ae98ee9
Author: Davide Sfriso <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:39:34 2008 -0800

Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 
'getent group'.

---

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


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_passdb.c 
b/source/winbindd/winbindd_passdb.c
index 0cf4540..101854a 100644
--- a/source/winbindd/winbindd_passdb.c
+++ b/source/winbindd/winbindd_passdb.c
@@ -639,13 +639,13 @@ static NTSTATUS sam_lookup_groupmem(struct 
winbindd_domain *domain,
  sid_type_lookup(lsa_names[i].type)));
continue;
}
-   if (!((*names)[i] = talloc_strdup((*names),
+   if (!((*names)[num_mapped] = talloc_strdup((*names),
  lsa_names[i].name))) {
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
 
-   (*name_types)[i] = lsa_names[i].type;
+   (*name_types)[num_mapped] = lsa_names[i].type;
 
num_mapped += 1;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 9ea794417e8bad3da4236f4071a0d8a23612ac8a

2008-11-17 Thread Jeremy Allison 
The branch, master has been updated
   via  9ea794417e8bad3da4236f4071a0d8a23612ac8a (commit)
  from  d8df43e65d507710de72c6743f43127ad14019fc (commit)

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


- Log -
commit 9ea794417e8bad3da4236f4071a0d8a23612ac8a
Author: Davide Sfriso <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:38:56 2008 -0800

Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 
'getent group'
Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_passdb.c 
b/source3/winbindd/winbindd_passdb.c
index 0cf4540..101854a 100644
--- a/source3/winbindd/winbindd_passdb.c
+++ b/source3/winbindd/winbindd_passdb.c
@@ -639,13 +639,13 @@ static NTSTATUS sam_lookup_groupmem(struct 
winbindd_domain *domain,
  sid_type_lookup(lsa_names[i].type)));
continue;
}
-   if (!((*names)[i] = talloc_strdup((*names),
+   if (!((*names)[num_mapped] = talloc_strdup((*names),
  lsa_names[i].name))) {
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
 
-   (*name_types)[i] = lsa_names[i].type;
+   (*name_types)[num_mapped] = lsa_names[i].type;
 
num_mapped += 1;
}


-- 
Samba Shared Repository

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

2008-11-17 Thread Jeremy Allison 
The branch, v3-3-test has been updated
   via  37233a3f62f4b0e5d4fc3376687f445656bded41 (commit)
  from  38f37ebb2478e62007e1eeb38054ad4f6949824a (commit)

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


- Log -
commit 37233a3f62f4b0e5d4fc3376687f445656bded41
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Mon Nov 17 14:13:28 2008 -0800

Fix bug #5900 reported by [EMAIL PROTECTED] - vfs_readonly.so does not work.
Jeremy.

---

Summary of changes:
 source/include/proto.h|3 ++-
 source/modules/vfs_readonly.c |   13 +
 source/smbd/share_access.c|6 --
 source/smbd/uid.c |3 ++-
 4 files changed, 21 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index b432e6b..3e3ddd4 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -10306,7 +10306,8 @@ bool user_ok_token(const char *username, const char 
*domain,
   struct nt_user_token *token, int snum);
 bool is_share_read_only_for_token(const char *username,
  const char *domain,
- struct nt_user_token *token, int snum);
+ struct nt_user_token *token,
+ connection_struct *conn);
 
 /* The following definitions come from smbd/srvstr.c  */
 
diff --git a/source/modules/vfs_readonly.c b/source/modules/vfs_readonly.c
index d4ddf32..58c83e5 100644
--- a/source/modules/vfs_readonly.c
+++ b/source/modules/vfs_readonly.c
@@ -64,12 +64,25 @@ static int readonly_connect(vfs_handle_struct *handle,
 "period", period_def); 
 
   if (period && period[0] && period[1]) {
+int i;
 time_t current_time = time(NULL);
 time_t begin_period = get_date(period[0], ¤t_time);
 time_t end_period   = get_date(period[1], ¤t_time);
 
 if ((current_time >= begin_period) && (current_time <= end_period)) {
+  connection_struct *conn = handle->conn;
+
   handle->conn->read_only = True;
+
+  /* Wipe out the VUID cache. */
+  for (i=0; i< VUID_CACHE_SIZE; i++) {
+struct vuid_cache_entry *ent = ent = &conn->vuid_cache.array[i];
+ent->vuid = UID_FIELD_INVALID;
+TALLOC_FREE(ent->server_info);
+ent->read_only = false;
+ent->admin_user = false;
+  }
+  conn->vuid_cache.next_entry = 0;
 }
 
 return SMB_VFS_NEXT_CONNECT(handle, service, user);
diff --git a/source/smbd/share_access.c b/source/smbd/share_access.c
index f5f79c8..9dbacc2 100644
--- a/source/smbd/share_access.c
+++ b/source/smbd/share_access.c
@@ -252,9 +252,11 @@ bool user_ok_token(const char *username, const char 
*domain,
 
 bool is_share_read_only_for_token(const char *username,
  const char *domain,
- struct nt_user_token *token, int snum)
+ struct nt_user_token *token,
+ connection_struct *conn)
 {
-   bool result = lp_readonly(snum);
+   int snum = SNUM(conn);
+   bool result = conn->read_only;
 
if (lp_readlist(snum) != NULL) {
if (token_contains_name_in_list(username, domain,
diff --git a/source/smbd/uid.c b/source/smbd/uid.c
index 045de6f..c238f40 100644
--- a/source/smbd/uid.c
+++ b/source/smbd/uid.c
@@ -88,7 +88,8 @@ static bool check_user_ok(connection_struct *conn, uint16_t 
vuid,
readonly_share = is_share_read_only_for_token(
server_info->unix_name,
pdb_get_domain(server_info->sam_account),
-   server_info->ptok, snum);
+   server_info->ptok,
+   conn);
 
if (!readonly_share &&
!share_access_check(server_info->ptok, lp_servicename(snum),


-- 
Samba Shared Repository

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

2008-11-17 Thread Jeremy Allison 
The branch, master has been updated
   via  d8df43e65d507710de72c6743f43127ad14019fc (commit)
  from  a48abdaa811c76e64a3383fe970e62b7bbb3582c (commit)

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


- Log -
commit d8df43e65d507710de72c6743f43127ad14019fc
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Mon Nov 17 14:13:20 2008 -0800

Fix bug #5900 reported by [EMAIL PROTECTED] - vfs_readonly.so does not work.
Jeremy.

---

Summary of changes:
 source3/include/proto.h|3 ++-
 source3/modules/vfs_readonly.c |   13 +
 source3/smbd/share_access.c|6 --
 source3/smbd/uid.c |3 ++-
 4 files changed, 21 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5f9203a..3342584 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8459,7 +8459,8 @@ bool user_ok_token(const char *username, const char 
*domain,
   struct nt_user_token *token, int snum);
 bool is_share_read_only_for_token(const char *username,
  const char *domain,
- struct nt_user_token *token, int snum);
+ struct nt_user_token *token,
+ connection_struct *conn);
 
 /* The following definitions come from smbd/srvstr.c  */
 
diff --git a/source3/modules/vfs_readonly.c b/source3/modules/vfs_readonly.c
index d4ddf32..58c83e5 100644
--- a/source3/modules/vfs_readonly.c
+++ b/source3/modules/vfs_readonly.c
@@ -64,12 +64,25 @@ static int readonly_connect(vfs_handle_struct *handle,
 "period", period_def); 
 
   if (period && period[0] && period[1]) {
+int i;
 time_t current_time = time(NULL);
 time_t begin_period = get_date(period[0], ¤t_time);
 time_t end_period   = get_date(period[1], ¤t_time);
 
 if ((current_time >= begin_period) && (current_time <= end_period)) {
+  connection_struct *conn = handle->conn;
+
   handle->conn->read_only = True;
+
+  /* Wipe out the VUID cache. */
+  for (i=0; i< VUID_CACHE_SIZE; i++) {
+struct vuid_cache_entry *ent = ent = &conn->vuid_cache.array[i];
+ent->vuid = UID_FIELD_INVALID;
+TALLOC_FREE(ent->server_info);
+ent->read_only = false;
+ent->admin_user = false;
+  }
+  conn->vuid_cache.next_entry = 0;
 }
 
 return SMB_VFS_NEXT_CONNECT(handle, service, user);
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index f5f79c8..9dbacc2 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -252,9 +252,11 @@ bool user_ok_token(const char *username, const char 
*domain,
 
 bool is_share_read_only_for_token(const char *username,
  const char *domain,
- struct nt_user_token *token, int snum)
+ struct nt_user_token *token,
+ connection_struct *conn)
 {
-   bool result = lp_readonly(snum);
+   int snum = SNUM(conn);
+   bool result = conn->read_only;
 
if (lp_readlist(snum) != NULL) {
if (token_contains_name_in_list(username, domain,
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 045de6f..c238f40 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -88,7 +88,8 @@ static bool check_user_ok(connection_struct *conn, uint16_t 
vuid,
readonly_share = is_share_read_only_for_token(
server_info->unix_name,
pdb_get_domain(server_info->sam_account),
-   server_info->ptok, snum);
+   server_info->ptok,
+   conn);
 
if (!readonly_share &&
!share_access_check(server_info->ptok, lp_servicename(snum),


-- 
Samba Shared Repository

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

2008-11-17 Thread Jeremy Allison 
The branch, v3-2-test has been updated
   via  1daad740c6f0e3914b691b3e9c57aaf68ba0ca01 (commit)
  from  4cd70457781907edf6641696cc311915905c96fa (commit)

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


- Log -
commit 1daad740c6f0e3914b691b3e9c57aaf68ba0ca01
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Mon Nov 17 14:05:55 2008 -0800

When clearing out vuid cache remember to set entries = 0.
Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_readonly.c b/source/modules/vfs_readonly.c
index ccb95b5..37d9e5a 100644
--- a/source/modules/vfs_readonly.c
+++ b/source/modules/vfs_readonly.c
@@ -78,6 +78,7 @@ static int readonly_connect(vfs_handle_struct *handle,
   for (i=0;ivuid_cache.entries && i< VUID_CACHE_SIZE;i++) {
 conn->vuid_cache.array[i].vuid = UID_FIELD_INVALID;
   }
+  conn->vuid_cache.entries = 0;
 }
 
 return SMB_VFS_NEXT_CONNECT(handle, service, user);


-- 
Samba Shared Repository

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

2008-11-17 Thread Jeremy Allison 
The branch, v3-2-test has been updated
   via  4cd70457781907edf6641696cc311915905c96fa (commit)
  from  0b4dd0cb1f81126344a6fe3304b46f880089718d (commit)

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


- Log -
commit 4cd70457781907edf6641696cc311915905c96fa
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Mon Nov 17 13:46:35 2008 -0800

Fix bug #5900 reported by [EMAIL PROTECTED] - vfs_readonly.so does not work.
Jeremy.

---

Summary of changes:
 source/modules/vfs_readonly.c |8 
 source/smbd/share_access.c|6 --
 source/smbd/uid.c |2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_readonly.c b/source/modules/vfs_readonly.c
index d4ddf32..ccb95b5 100644
--- a/source/modules/vfs_readonly.c
+++ b/source/modules/vfs_readonly.c
@@ -64,12 +64,20 @@ static int readonly_connect(vfs_handle_struct *handle,
 "period", period_def); 
 
   if (period && period[0] && period[1]) {
+int i;
 time_t current_time = time(NULL);
 time_t begin_period = get_date(period[0], ¤t_time);
 time_t end_period   = get_date(period[1], ¤t_time);
 
 if ((current_time >= begin_period) && (current_time <= end_period)) {
+  connection_struct *conn = handle->conn;
+
   handle->conn->read_only = True;
+
+  /* Wipe out the VUID cache. */
+  for (i=0;ivuid_cache.entries && i< VUID_CACHE_SIZE;i++) {
+conn->vuid_cache.array[i].vuid = UID_FIELD_INVALID;
+  }
 }
 
 return SMB_VFS_NEXT_CONNECT(handle, service, user);
diff --git a/source/smbd/share_access.c b/source/smbd/share_access.c
index 5121262..e89934c 100644
--- a/source/smbd/share_access.c
+++ b/source/smbd/share_access.c
@@ -248,9 +248,11 @@ bool user_ok_token(const char *username, struct 
nt_user_token *token, int snum)
  */
 
 bool is_share_read_only_for_token(const char *username,
- struct nt_user_token *token, int snum)
+   struct nt_user_token *token,
+   connection_struct *conn)
 {
-   bool result = lp_readonly(snum);
+   int snum = SNUM(conn);
+   bool result = conn->read_only;
 
if (lp_readlist(snum) != NULL) {
if (token_contains_name_in_list(username,
diff --git a/source/smbd/uid.c b/source/smbd/uid.c
index ffa643a..631a37f 100644
--- a/source/smbd/uid.c
+++ b/source/smbd/uid.c
@@ -102,7 +102,7 @@ static bool check_user_ok(connection_struct *conn, 
user_struct *vuser,int snum)
 
readonly_share = is_share_read_only_for_token(vuser->user.unix_name,
  vuser->nt_user_token,
- SNUM(conn));
+ conn);
 
token = conn->nt_user_token ?
conn->nt_user_token : vuser->nt_user_token;


-- 
Samba Shared Repository

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

2008-11-17 Thread Günther Deschner 
The branch, v3-3-test has been updated
   via  38f37ebb2478e62007e1eeb38054ad4f6949824a (commit)
  from  3d64e67de2b50f7b781aa3f5ad13ec8e866d4333 (commit)

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


- Log -
commit 38f37ebb2478e62007e1eeb38054ad4f6949824a
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Mon Nov 17 18:25:01 2008 +0100

s3-libnet-samsync: use enctype 23 for vampired keytab entries.

Guenther
(cherry picked from commit a48abdaa811c76e64a3383fe970e62b7bbb3582c)

---

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


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_samsync_keytab.c 
b/source/libnet/libnet_samsync_keytab.c
index 4b0cc06..0341641 100644
--- a/source/libnet/libnet_samsync_keytab.c
+++ b/source/libnet/libnet_samsync_keytab.c
@@ -90,7 +90,7 @@ static NTSTATUS fetch_sam_entry_keytab(TALLOC_CTX *mem_ctx,
  ctx->dns_domain_name);
entry.password = data_blob_talloc(mem_ctx, r->ntpassword.hash, 16);
entry.kvno = ads_get_kvno(ctx->ads, entry.name);
-   entry.enctype = ENCTYPE_NULL;
+   entry.enctype = ENCTYPE_ARCFOUR_HMAC;
 
NT_STATUS_HAVE_NO_MEMORY(entry.name);
NT_STATUS_HAVE_NO_MEMORY(entry.principal);


-- 
Samba Shared Repository

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

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  a48abdaa811c76e64a3383fe970e62b7bbb3582c (commit)
  from  0b1015d73edd437fdc85dd765e59cb5ae232afac (commit)

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


- Log -
commit a48abdaa811c76e64a3383fe970e62b7bbb3582c
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Mon Nov 17 18:25:01 2008 +0100

s3-libnet-samsync: use enctype 23 for vampired keytab entries.

Guenther

---

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


Changeset truncated at 500 lines:

diff --git a/source3/libnet/libnet_samsync_keytab.c 
b/source3/libnet/libnet_samsync_keytab.c
index 4b0cc06..0341641 100644
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/libnet/libnet_samsync_keytab.c
@@ -90,7 +90,7 @@ static NTSTATUS fetch_sam_entry_keytab(TALLOC_CTX *mem_ctx,
  ctx->dns_domain_name);
entry.password = data_blob_talloc(mem_ctx, r->ntpassword.hash, 16);
entry.kvno = ads_get_kvno(ctx->ads, entry.name);
-   entry.enctype = ENCTYPE_NULL;
+   entry.enctype = ENCTYPE_ARCFOUR_HMAC;
 
NT_STATUS_HAVE_NO_MEMORY(entry.name);
NT_STATUS_HAVE_NO_MEMORY(entry.principal);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 0b1015d73edd437fdc85dd765e59cb5ae232afac

2008-11-17 Thread Tim Prouty 
The branch, master has been updated
   via  0b1015d73edd437fdc85dd765e59cb5ae232afac (commit)
  from  0cba859f12177aaf3ef2d96663f0a51f61c24d56 (commit)

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


- Log -
commit 0b1015d73edd437fdc85dd765e59cb5ae232afac
Author: Tim Prouty <[EMAIL PROTECTED]>
Date:   Mon Nov 17 10:21:29 2008 -0800

Fix build warning introduced by making SERVICE_CONTROL an enum

---

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_svcctl_nt.c 
b/source3/rpc_server/srv_svcctl_nt.c
index 4beab64..0bed13e 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -517,11 +517,9 @@ WERROR _svcctl_ControlService(pipes_struct *p,
 
return info->ops->service_status( info->name,
  r->out.service_status );
+   default:
+   return WERR_ACCESS_DENIED;
}
-
-   /* default control action */
-
-   return WERR_ACCESS_DENIED;
 }
 
 /


-- 
Samba Shared Repository

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

2008-11-17 Thread Karolin Seeger 
The branch, v3-2-test has been updated
   via  0b4dd0cb1f81126344a6fe3304b46f880089718d (commit)
  from  0a7fb721cdc0d825cf246d53075ad32a81b2b31d (commit)

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


- Log -
commit 0b4dd0cb1f81126344a6fe3304b46f880089718d
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:23:34 2008 +0100

s3 create-tarball.sh: Remove dashes in git commands.

Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.

Karolin
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
(cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)
(cherry picked from commit aa41a80969bd413d5922c602c7309bd8c05f3181)

---

Summary of changes:
 release-scripts/create-tarball |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
 fi
 
-if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
read answer
 
@@ -155,7 +155,7 @@ function createReleaseTag
fi
 fi
 
-git-tag -u ${OPT_KEYID} ${OPT_TAG}
+git tag -u ${OPT_KEYID} ${OPT_TAG}
 exitOnError $? "Failed to create tag"
 
 return 0
@@ -170,7 +170,7 @@ function main
 
 cd $TOPDIR
 
-git-checkout ${OPT_BRANCH}
+git checkout ${OPT_BRANCH}
 exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
 (cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
 echo "Creating release tarball for Samba $version"
 
 /bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
+git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
 exitOnError $? "Failed to create release directory tree"
 
 pushd ../samba-${version}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre2-78-gaa41a80

2008-11-17 Thread Karolin Seeger 
The branch, v3-3-stable has been updated
   via  aa41a80969bd413d5922c602c7309bd8c05f3181 (commit)
  from  df97ffbaf376ea322b30465332cbba0f2af5ce42 (commit)

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


- Log -
commit aa41a80969bd413d5922c602c7309bd8c05f3181
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:23:34 2008 +0100

s3 create-tarball.sh: Remove dashes in git commands.

Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.

Karolin
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
(cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)

---

Summary of changes:
 release-scripts/create-tarball |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
 fi
 
-if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
read answer
 
@@ -155,7 +155,7 @@ function createReleaseTag
fi
 fi
 
-git-tag -u ${OPT_KEYID} ${OPT_TAG}
+git tag -u ${OPT_KEYID} ${OPT_TAG}
 exitOnError $? "Failed to create tag"
 
 return 0
@@ -170,7 +170,7 @@ function main
 
 cd $TOPDIR
 
-git-checkout ${OPT_BRANCH}
+git checkout ${OPT_BRANCH}
 exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
 (cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
 echo "Creating release tarball for Samba $version"
 
 /bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
+git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
 exitOnError $? "Failed to create release directory tree"
 
 pushd ../samba-${version}


-- 
Samba Shared Repository

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

2008-11-17 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  3d64e67de2b50f7b781aa3f5ad13ec8e866d4333 (commit)
  from  e64c4ff6061422f79e550810affd1c90c7eb22a0 (commit)

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


- Log -
commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:23:34 2008 +0100

s3 create-tarball.sh: Remove dashes in git commands.

Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.

Karolin
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)

---

Summary of changes:
 release-scripts/create-tarball |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
 fi
 
-if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
read answer
 
@@ -155,7 +155,7 @@ function createReleaseTag
fi
 fi
 
-git-tag -u ${OPT_KEYID} ${OPT_TAG}
+git tag -u ${OPT_KEYID} ${OPT_TAG}
 exitOnError $? "Failed to create tag"
 
 return 0
@@ -170,7 +170,7 @@ function main
 
 cd $TOPDIR
 
-git-checkout ${OPT_BRANCH}
+git checkout ${OPT_BRANCH}
 exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
 (cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
 echo "Creating release tarball for Samba $version"
 
 /bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
+git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
 exitOnError $? "Failed to create release directory tree"
 
 pushd ../samba-${version}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 0cba859f12177aaf3ef2d96663f0a51f61c24d56

2008-11-17 Thread Karolin Seeger 
The branch, master has been updated
   via  0cba859f12177aaf3ef2d96663f0a51f61c24d56 (commit)
  from  0e801722e335c1bd17897848bf63d2acf4576b2e (commit)

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


- Log -
commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Nov 17 15:23:34 2008 +0100

s3 create-tarball.sh: Remove dashes in git commands.

Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.

Karolin

---

Summary of changes:
 release-scripts/create-tarball |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 04728d8..ab27f08 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
 fi
 
-if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
read answer
 
@@ -155,7 +155,7 @@ function createReleaseTag
fi
 fi
 
-git-tag -u ${OPT_KEYID} ${OPT_TAG}
+git tag -u ${OPT_KEYID} ${OPT_TAG}
 exitOnError $? "Failed to create tag"
 
 return 0
@@ -170,7 +170,7 @@ function main
 
 cd $TOPDIR
 
-git-checkout ${OPT_BRANCH}
+git checkout ${OPT_BRANCH}
 exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
 (cd source3 && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
 echo "Creating release tarball for Samba $version"
 
 /bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
+git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar 
xf -)
 exitOnError $? "Failed to create release directory tree"
 
 pushd ../samba-${version}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 0e801722e335c1bd17897848bf63d2acf4576b2e

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  0e801722e335c1bd17897848bf63d2acf4576b2e (commit)
   via  5b4140a99767db9f0dfa02049e4dcff23a7fdb83 (commit)
   via  738d066768a8aebf0d9522e49d30e2df0ad4f07b (commit)
   via  2409f216cfb74079687929d670b8ebc29e54a038 (commit)
   via  abbd539082022166b7e3a222eb3dc050b3ae7279 (commit)
   via  4e0bbb6e7919212572ba66b8808d8cef1ec3e772 (commit)
   via  c0db253507569804e0cc852a58b5fa9117ebc92e (commit)
   via  b43c3a36a7b8950421bd2f4b9c9eea809fd6f0dc (commit)
   via  880e232e7ea57531bd9dcb26f130a174534eea6a (commit)
   via  2d44f72c337f9877ce5931893914d47c437d205a (commit)
  from  2fbdf22541497b56143083863bf1ffe5af7487fd (commit)

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


- Log -
commit 0e801722e335c1bd17897848bf63d2acf4576b2e
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:54:46 2008 +0100

s3-build: re-run make samba3-idl.

Guenther

commit 5b4140a99767db9f0dfa02049e4dcff23a7fdb83
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:54:16 2008 +0100

svcctl: fill in SERVICE_CONTROL from s3.

Guenther

commit 738d066768a8aebf0d9522e49d30e2df0ad4f07b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:41:40 2008 +0100

svcctl: fix idl for svcctl_EnumServicesStatusW.

Guenther

commit 2409f216cfb74079687929d670b8ebc29e54a038
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:36:47 2008 +0100

s4-smbtorture: add test for svcctl_QueryServiceConfig2W.

Guenther

commit abbd539082022166b7e3a222eb3dc050b3ae7279
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:29:03 2008 +0100

svcctl: fix idl for svcctl_QueryServiceConfig2W.

Guenther

commit 4e0bbb6e7919212572ba66b8808d8cef1ec3e772
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:26:25 2008 +0100

svcctl: fix idl for EnumServicesStatusExW.

Guenther

commit c0db253507569804e0cc852a58b5fa9117ebc92e
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:25:30 2008 +0100

s4-smbtorture: fix test for svcctl_EnumServicesStatusW.

Guenther

commit b43c3a36a7b8950421bd2f4b9c9eea809fd6f0dc
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:24:52 2008 +0100

s4-smbtorture: add test for svcctl_QueryServiceStatusEx.

Guenther

commit 880e232e7ea57531bd9dcb26f130a174534eea6a
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 11:24:10 2008 +0100

svcctl: fix idl for svcctl_QueryServiceStatusEx.

Guenther

commit 2d44f72c337f9877ce5931893914d47c437d205a
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 10:18:35 2008 +0100

s4-smbtorture: pure reformatting of svcctl test.

Guenther

---

Summary of changes:
 librpc/idl/svcctl.idl   |   44 ---
 source3/include/rpc_svcctl.h|8 --
 source3/librpc/gen_ndr/cli_svcctl.c |   36 +++---
 source3/librpc/gen_ndr/cli_svcctl.h |   34 +++---
 source3/librpc/gen_ndr/ndr_svcctl.c |  216 ++-
 source3/librpc/gen_ndr/ndr_svcctl.h |1 +
 source3/librpc/gen_ndr/srv_svcctl.c |6 -
 source3/librpc/gen_ndr/svcctl.h |   48 +
 source4/torture/rpc/svcctl.c|  178 -
 9 files changed, 397 insertions(+), 174 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/svcctl.idl b/librpc/idl/svcctl.idl
index fa8e109..4b88f5e 100644
--- a/librpc/idl/svcctl.idl
+++ b/librpc/idl/svcctl.idl
@@ -89,13 +89,19 @@ import "misc.idl", "security.idl";
/*/
/* Function 0x01 */
 
-   typedef enum {
-   FIXME=1
+   /* Service Controls */
+
+   typedef [v1_enum] enum {
+   SVCCTL_CONTROL_STOP = 0x0001,
+   SVCCTL_CONTROL_PAUSE= 0x0002,
+   SVCCTL_CONTROL_CONTINUE = 0x0003,
+   SVCCTL_CONTROL_INTERROGATE  = 0x0004,
+   SVCCTL_CONTROL_SHUTDOWN = 0x0005
} SERVICE_CONTROL;
 
WERROR svcctl_ControlService(
[in,ref] policy_handle *handle,
-   [in] uint32 control,
+   [in] SERVICE_CONTROL control,
[out,ref] SERVICE_STATUS *service_status
);
 
@@ -218,10 +224,10 @@ import "misc.idl", "security.idl";
[in,ref] policy_handle *handle,
[in] uint32 type,
[in] uint32 state,
-   [in] uint32 buf_size,
-   [out,size_is(buf_size)] uint8 service[*],
-   [out,ref] uint32 *bytes_needed,
-   [out,ref] uint32 *services_returned,
+   [out,ref,size_is(buf_size)] uint8 *service,
+   [in] [range(0,26

Re: [SCM] Samba Shared Repository - branch master updated - 3d0a3c1078d936a52ce82720ddc09b4037653655

2008-11-17 Thread simo 
On Sun, 2008-11-16 at 18:12 -0600, Andrew Bartlett wrote:
> The branch, master has been updated
>via  3d0a3c1078d936a52ce82720ddc09b4037653655 (commit)
>via  16a3a2da78b1f2d5a1077e382a26466944f6c59e (commit)
>via  cf5c919c744c714b9be849e4d6424f7df92b328d (commit)
>via  5b796adb125174084cfc2a6f04cfdac5e9324ef8 (commit)
>via  00b63434063a128662d4ce83ce382fc2e6102d22 (commit)
>via  8e1934a3845944ba7d79848368976e82d182e8d1 (commit)
>via  109719de030cb2432bea991077b12b4cf937c108 (commit)
>via  9abd45979ee0415c16775f6dfd17a6e421091d5c (commit)
>   from  1d9c88b3885728aba3d7fef85d80501125011f1c (commit)
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -
> commit 3d0a3c1078d936a52ce82720ddc09b4037653655
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Wed Nov 5 12:00:44 2008 +1100
> 
> Add helpful function for comparison of DATA_BLOB elements
> 
> commit 16a3a2da78b1f2d5a1077e382a26466944f6c59e
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Thu Nov 13 14:07:29 2008 +1100
> 
> Remove timeout event once we are calling the callback.
> 
> (Even if the callback takes some time, this isn't a ldb_tdb timeout
> any more)
> 
> Andrew Bartlett

I think this is wrong Andrew.
The callback is fully part of the call and the timeout should apply.
You may rise the timeout time if you think that normally we should give
more time. But certainly not remove the timeout imo.

> commit cf5c919c744c714b9be849e4d6424f7df92b328d
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Thu Nov 13 15:58:12 2008 +1100
> 
> Improve debug when SASL search fails
> 
> commit 5b796adb125174084cfc2a6f04cfdac5e9324ef8
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Fri Nov 14 09:40:02 2008 +1100
> 
> Print unconvertable ldb element values as base64.
> 
> If an LDB element cannot be converted into a printable form, we should
> still print it, just with safety applied.
> 
> Andrew Bartlett
> 
> commit 00b63434063a128662d4ce83ce382fc2e6102d22
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Fri Nov 14 13:26:02 2008 +1100
> 
> The samba3sam test does not really need the extended_dn module
> 
> (This module has been split up into extended_dn_in, extended_dn_out
> and extended_dn_store).
> 
> Andrew Bartlett
> 
> commit 8e1934a3845944ba7d79848368976e82d182e8d1
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Fri Nov 14 13:24:54 2008 +1100
> 
> Use new GUID_from_data_blob
> 
> This avoid the problem that GUID_from_string now strictly requires no
> trailing data after the string-form GUID.
> 
> Andrew Bartlett
> 
> commit 109719de030cb2432bea991077b12b4cf937c108
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Fri Nov 14 16:34:59 2008 +1100
> 
> Remove restrictions on number of DN components in LDAP server
> 
> There is no reason for these restrictions to be in the LDAP server -
> they belong in the LDB layer.  When accepting 'extended' or
> 'alternate' DNs we can't tell anyway.

No, they certainly do not belong in LDB, as LDB does not have the same
restrictions as the LDAP server. I would like you to put them back.

> Andrew Bartlett
> 
> commit 9abd45979ee0415c16775f6dfd17a6e421091d5c
> Author: Andrew Bartlett <[EMAIL PROTECTED]>
> Date:   Fri Nov 14 17:16:39 2008 +1100
> 
> Always validate a DN when constructing from a string in python

This may make the python bindings much slower ... but perhaps that's ok
for the bindings.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer <[EMAIL PROTECTED]>
Senior Software Engineer at Red Hat Inc. <[EMAIL PROTECTED]>

[SCM] Samba Shared Repository - branch master updated - 2fbdf22541497b56143083863bf1ffe5af7487fd

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  2fbdf22541497b56143083863bf1ffe5af7487fd (commit)
   via  fea323bdf3e4b87af87a8b69e9e528e04e34fe07 (commit)
   via  7d5f3f51b0f576d99e22fdb95e013b857071f978 (commit)
  from  f09231254e2777dd8a1bb897139eec2d0b5b (commit)

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


- Log -
commit 2fbdf22541497b56143083863bf1ffe5af7487fd
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 00:52:50 2008 +0100

s3-rpcclient: fill in unknowns in cmd_ntsvcs_get_hw_prof_info.

Guenther

commit fea323bdf3e4b87af87a8b69e9e528e04e34fe07
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 00:30:11 2008 +0100

s4-smbtorture: add PNP_GetDeviceRegProp test for ntsvcs testsuite.

Guenther

commit 7d5f3f51b0f576d99e22fdb95e013b857071f978
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Nov 14 09:48:56 2008 +0100

ntsvcs: remove todo from PNP_GetDeviceList.

Guenther

---

Summary of changes:
 librpc/idl/ntsvcs.idl  |2 +-
 source3/rpcclient/cmd_ntsvcs.c |6 +++---
 source4/torture/rpc/ntsvcs.c   |   40 
 3 files changed, 44 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/ntsvcs.idl b/librpc/idl/ntsvcs.idl
index d502435..be7fcdf 100644
--- a/librpc/idl/ntsvcs.idl
+++ b/librpc/idl/ntsvcs.idl
@@ -70,7 +70,7 @@ interface ntsvcs
/**/
/* Function: 0x0a */
 
-   [todo] WERROR PNP_GetDeviceList(
+   WERROR PNP_GetDeviceList(
[in,unique] [string,charset(UTF16)] uint16 *filter,
[out,ref] [size_is(*length),length_is(*length)] uint16 *buffer,
[in,out,ref] uint32 *length,
diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index 7a25352..11f16d3 100644
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -122,15 +122,15 @@ static WERROR cmd_ntsvcs_get_hw_prof_info(struct 
rpc_pipe_client *cli,
WERROR werr;
uint32_t idx = 0;
struct PNP_HwProfInfo info;
-   uint32_t unknown1 = 0, unknown2 = 0;
+   uint32_t size = 0, flags = 0;
 
ZERO_STRUCT(info);
 
status = rpccli_PNP_GetHwProfInfo(cli, mem_ctx,
  idx,
  &info,
- unknown1,
- unknown2,
+ size,
+ flags,
  &werr);
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
diff --git a/source4/torture/rpc/ntsvcs.c b/source4/torture/rpc/ntsvcs.c
index 3db79ac..5453102 100644
--- a/source4/torture/rpc/ntsvcs.c
+++ b/source4/torture/rpc/ntsvcs.c
@@ -108,6 +108,44 @@ static bool test_PNP_GetDeviceList(struct torture_context 
*tctx,
return true;
 }
 
+static bool test_PNP_GetDeviceRegProp(struct torture_context *tctx,
+ struct dcerpc_pipe *p)
+{
+   NTSTATUS status;
+   struct PNP_GetDeviceRegProp r;
+
+   enum winreg_Type reg_data_type = REG_NONE;
+   uint32_t buffer_size = 0;
+   uint32_t needed = 0;
+   uint8_t *buffer;
+
+   buffer = talloc(tctx, uint8_t);
+
+   r.in.devicepath = "ACPI\\ACPI0003\\1";
+   r.in.property = DEV_REGPROP_DESC;
+   r.in.flags = 0;
+   r.in.reg_data_type = ®_data_type;
+   r.in.buffer_size = &buffer_size;
+   r.in.needed = &needed;
+   r.out.buffer = buffer;
+   r.out.reg_data_type = ®_data_type;
+   r.out.buffer_size = &buffer_size;
+   r.out.needed = &needed;
+
+   status = dcerpc_PNP_GetDeviceRegProp(p, tctx, &r);
+   torture_assert_ntstatus_ok(tctx, status, "PNP_GetDeviceRegProp");
+
+   if (W_ERROR_EQUAL(r.out.result, WERR_CM_BUFFER_SMALL)) {
+
+   buffer = talloc_array(tctx, uint8_t, needed);
+   r.in.buffer_size = &needed;
+
+   status = dcerpc_PNP_GetDeviceRegProp(p, tctx, &r);
+   torture_assert_ntstatus_ok(tctx, status, 
"PNP_GetDeviceRegProp");
+   }
+
+   return true;
+}
 
 struct torture_suite *torture_rpc_ntsvcs(TALLOC_CTX *mem_ctx)
 {
@@ -118,6 +156,8 @@ struct torture_suite *torture_rpc_ntsvcs(TALLOC_CTX 
*mem_ctx)
tcase = torture_suite_add_rpc_iface_tcase(suite, "ntsvcs",
  &ndr_table_ntsvcs);
 
+   test = torture_rpc_tcase_add_test(tcase, "PNP_GetDeviceRegProp",
+ test_PNP_GetDeviceRegProp);
test = torture_rpc_tcase_add_test(tcase, "PNP_GetDeviceList",
  test_PNP_GetDeviceList);

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

2008-11-17 Thread Günther Deschner 
The branch, v3-3-test has been updated
   via  e64c4ff6061422f79e550810affd1c90c7eb22a0 (commit)
  from  0d874b23a43778931c0c570c5aa77bec6888d21d (commit)

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


- Log -
commit e64c4ff6061422f79e550810affd1c90c7eb22a0
Author: Bo Yang <[EMAIL PROTECTED]>
Date:   Sun Nov 16 16:34:34 2008 +0800

Fix broken msgids in ntstatus_errors

Signed-off-by: Günther Deschner <[EMAIL PROTECTED]>

---

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


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index cc6bf22..e94f9af 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -552,14 +552,14 @@ static const struct ntstatus_errors {
{"NT_STATUS_INVALID_LOGON_HOURS",
N_("You are not allowed to logon at this time")},
{"NT_STATUS_ACCOUNT_EXPIRED",
-   N_("Your account has expired. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account has expired. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_ACCOUNT_DISABLED",
-   N_("Your account is disabled. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account is disabled. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_ACCOUNT_LOCKED_OUT",
-   N_("Your account has been locked. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account has been locked. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT",
N_("Invalid Trust Account")},
{"NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT",


-- 
Samba Shared Repository

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

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  f09231254e2777dd8a1bb897139eec2d0b5b (commit)
  from  327d2be4529722b69e1663858f634a79c5091ed9 (commit)

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


- Log -
commit f09231254e2777dd8a1bb897139eec2d0b5b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Mon Nov 17 13:06:42 2008 +0100

pam_winbind: rerun genmsg after Bo Yang's fixes.

Guenther

---

Summary of changes:
 source3/locale/pam_winbind/de.po |   19 +++
 1 files changed, 7 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locale/pam_winbind/de.po b/source3/locale/pam_winbind/de.po
index 79ec20f..5a7223d 100644
--- a/source3/locale/pam_winbind/de.po
+++ b/source3/locale/pam_winbind/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @[EMAIL PROTECTED]"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 17:21+0100\n"
+"POT-Creation-Date: 2008-11-17 12:00+0100\n"
 "PO-Revision-Date: 2008-11-13 14:29+0100\n"
 "Last-Translator: Guenther Deschner <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -60,21 +60,16 @@ msgid "You are not allowed to logon at this time"
 msgstr "Sie können sich zum jetzigen Zeitpunkt nicht anmelden"
 
 #: ../../nsswitch/pam_winbind.c:601
-#, fuzzy
-msgid "Your account has expired. "
-msgstr "Ihr Benutzerkonto ist abgelaufen"
-
-#: ../../nsswitch/pam_winbind.c:602 ../../nsswitch/pam_winbind.c:605 
../../nsswitch/pam_winbind.c:608
-msgid "Please contact your System administrator"
-msgstr "Bitte kontaktieren Sie ihren System-Administrator"
+msgid "Your account has expired. Please contact your System administrator"
+msgstr "Ihr Benutzerkonto ist abgelaufen. Bitte kontaktieren Sie ihren 
System-Administrator"
 
 #: ../../nsswitch/pam_winbind.c:604
-msgid "Your account is disabled. "
-msgstr "Ihr Benutzerkonto ist deaktiviert. "
+msgid "Your account is disabled. Please contact your System administrator"
+msgstr "Ihr Benutzerkonto ist deaktiviert. Bitte kontaktieren Sie ihren 
System-Administrator"
 
 #: ../../nsswitch/pam_winbind.c:607
-msgid "Your account has been locked. "
-msgstr "Ihr Benutzerkonto wurde gesperrt. "
+msgid "Your account has been locked. Please contact your System administrator"
+msgstr "Ihr Benutzerkonto wurde gesperrt. Bitte kontaktieren Sie ihren 
System-Administrator"
 
 #: ../../nsswitch/pam_winbind.c:610 ../../nsswitch/pam_winbind.c:612 
../../nsswitch/pam_winbind.c:614
 msgid "Invalid Trust Account"


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 327d2be4529722b69e1663858f634a79c5091ed9

2008-11-17 Thread Stefan Metzmacher 
The branch, master has been updated
   via  327d2be4529722b69e1663858f634a79c5091ed9 (commit)
  from  29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec (commit)

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


- Log -
commit 327d2be4529722b69e1663858f634a79c5091ed9
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Mon Nov 17 10:51:39 2008 +0100

s4:dsdb/samdb: don't allow objects without objectClass

We're using @ROOTDSE instead of CN=ROOTDSE.

metze

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/objectclass.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c 
b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 7d00851..1d240a3 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -414,10 +414,10 @@ static int objectclass_add(struct ldb_module *module, 
struct ldb_request *req)
return ldb_next_request(module, req);
}
 
-   /* Need to object to this, but cn=rootdse doesn't have an 
objectClass... */
+   /* the objectClass must be specified on add */
if (ldb_msg_find_element(req->op.add.message, 
 "objectClass") == NULL) {
-   return ldb_next_request(module, req);
+   return LDB_ERR_OBJECT_CLASS_VIOLATION;
}
 
ac = oc_init_context(module, req);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec (commit)
  from  806a45c3c7e33fad90597f87373a532016e614e3 (commit)

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


- Log -
commit 29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec
Author: Bo Yang <[EMAIL PROTECTED]>
Date:   Sun Nov 16 16:31:31 2008 +0800

Fix broken msgids in ntstatus_errors

Signed-off-by: Günther Deschner <[EMAIL PROTECTED]>

---

Summary of changes:
 source3/nsswitch/pam_winbind.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index c164f8e..1daa05e 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -598,14 +598,14 @@ static const struct ntstatus_errors {
{"NT_STATUS_INVALID_LOGON_HOURS",
N_("You are not allowed to logon at this time")},
{"NT_STATUS_ACCOUNT_EXPIRED",
-   N_("Your account has expired. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account has expired. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_ACCOUNT_DISABLED",
-   N_("Your account is disabled. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account is disabled. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_ACCOUNT_LOCKED_OUT",
-   N_("Your account has been locked. ")
-   N_("Please contact your System administrator")}, /* SCNR */
+   N_("Your account has been locked. "
+  "Please contact your System administrator")}, /* SCNR */
{"NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT",
N_("Invalid Trust Account")},
{"NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT",


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - 806a45c3c7e33fad90597f87373a532016e614e3

2008-11-17 Thread Günther Deschner 
The branch, master has been updated
   via  806a45c3c7e33fad90597f87373a532016e614e3 (commit)
  from  5e5ccab372035a4e46e83775f40fca1ae5542ada (commit)

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


- Log -
commit 806a45c3c7e33fad90597f87373a532016e614e3
Author: Andreas Schneider <[EMAIL PROTECTED]>
Date:   Mon Nov 17 11:01:15 2008 +0100

Improve the Gemand pam_winbind translation.

Signed-off-by: Andreas Schneider <[EMAIL PROTECTED]>

---

Summary of changes:
 source3/locale/pam_winbind/de.po |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locale/pam_winbind/de.po b/source3/locale/pam_winbind/de.po
index 642d9d3..79ec20f 100644
--- a/source3/locale/pam_winbind/de.po
+++ b/source3/locale/pam_winbind/de.po
@@ -62,7 +62,7 @@ msgstr "Sie können sich zum jetzigen Zeitpunkt nicht 
anmelden"
 #: ../../nsswitch/pam_winbind.c:601
 #, fuzzy
 msgid "Your account has expired. "
-msgstr "Ihr Passwort ist abgelaufen"
+msgstr "Ihr Benutzerkonto ist abgelaufen"
 
 #: ../../nsswitch/pam_winbind.c:602 ../../nsswitch/pam_winbind.c:605 
../../nsswitch/pam_winbind.c:608
 msgid "Please contact your System administrator"
@@ -70,15 +70,15 @@ msgstr "Bitte kontaktieren Sie ihren System-Administrator"
 
 #: ../../nsswitch/pam_winbind.c:604
 msgid "Your account is disabled. "
-msgstr "Ihr Account ist deaktiviert. "
+msgstr "Ihr Benutzerkonto ist deaktiviert. "
 
 #: ../../nsswitch/pam_winbind.c:607
 msgid "Your account has been locked. "
-msgstr "Ihr Account wurde gesperrt. "
+msgstr "Ihr Benutzerkonto wurde gesperrt. "
 
 #: ../../nsswitch/pam_winbind.c:610 ../../nsswitch/pam_winbind.c:612 
../../nsswitch/pam_winbind.c:614
 msgid "Invalid Trust Account"
-msgstr "Ungültiger Maschinen-Account"
+msgstr "Ungültiges Maschinen-Konto"
 
 #: ../../nsswitch/pam_winbind.c:616
 msgid "Access is denied"
@@ -103,7 +103,7 @@ msgstr "Tag"
 
 #: ../../nsswitch/pam_winbind.c:1253
 msgid "Grace login. Please change your password as soon you're online again"
-msgstr ""
+msgstr "Kulanzanmeldung. Bitte ändern sie ihr Passwort sobald sie wieder 
online sind"
 
 #: ../../nsswitch/pam_winbind.c:1263
 msgid "Domain Controller unreachable, using cached credentials instead. 
Network resources may be unavailable"
@@ -115,7 +115,7 @@ msgid ""
 "with the domain controller.  Please verify the system time.\n"
 msgstr ""
 "Anforderung eines Kerberos Tickets aufgrund Zeitunterscheid zum \n"
-"Domänen-Controller fehlgeschlagen. Bitte überprüfen Sie die System Zeit.\n"
+"Domänen-Controller fehlgeschlagen. Bitte überprüfen Sie die Systemzeit.\n"
 
 #: ../../nsswitch/pam_winbind.c:1356
 msgid "Your password "
@@ -133,7 +133,7 @@ msgstr "kann keines der %d vorherigen Passwörter 
enthalten; "
 
 #: ../../nsswitch/pam_winbind.c:1382
 msgid "must contain capitals, numerals or punctuation; and cannot contain your 
account or full name; "
-msgstr "muß Großbuchstaben, Ziffern oder Punktzeichen enthalten; kann nicht 
den Anmelde- oder Vollnamen enthalten; "
+msgstr "muß Großbuchstaben, Ziffern oder Punktzeichen enthalten; kann nicht 
den Benutzer- oder vollen Namen enthalten; "
 
 #: ../../nsswitch/pam_winbind.c:1392
 msgid "Please type a different password. Type a password which meets these 
requirements in both text boxes."


-- 
Samba Shared Repository