[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  eb6e22b s4:torture: add a check for talloc success in test_session_reauth
       via  aff3769 s3: remove some unused code
       via  e1bf9cc s3: Fix a typo
      from  c8e6d8b s4-dsdb: Use data_blob_string_const and add explaination for open-coded function in samldb

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


- Log -----------------------------------------------------------------
commit eb6e22bcab89619538e93d08ec70089a437c75e3
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 2 11:31:30 2012 +0200

    s4:torture: add a check for talloc success in test_session_reauth
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Fri May  4 16:50:59 CEST 2012 on sn-devel-104

commit aff3769d9fb9aff84428c6edb091b7d172d778b8
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 4 13:01:32 2012 +0200

    s3: remove some unused code

commit e1bf9ccffde410fe7e1b697259337c726cb713f1
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 4 11:49:24 2012 +0200

    s3: Fix a typo

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/auth_util.c      |   27 ---------------------------
 source3/auth/proto.h          |    1 -
 source3/smbd/open.c           |    2 +-
 source4/torture/raw/session.c |    1 +
 4 files changed, 2 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index de395a5..6075232 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -1177,33 +1177,6 @@ const struct auth_session_info *get_session_info_system(void)
     return system_info;
 }
 
-bool copy_current_user(struct current_user *dst, struct current_user *src)
-{
-	gid_t *groups;
-	struct security_token *nt_token;
-
-	groups = (gid_t *)memdup(src->ut.groups,
-				 sizeof(gid_t) * src->ut.ngroups);
-	if ((src->ut.ngroups != 0) && (groups == NULL)) {
-		return false;
-	}
-
-	nt_token = dup_nt_token(NULL, src->nt_user_token);
-	if (nt_token == NULL) {
-		SAFE_FREE(groups);
-		return false;
-	}
-
-	dst->conn = src->conn;
-	dst->vuid = src->vuid;
-	dst->ut.uid = src->ut.uid;
-	dst->ut.gid = src->ut.gid;
-	dst->ut.ngroups = src->ut.ngroups;
-	dst->ut.groups = groups;
-	dst->nt_user_token = nt_token;
-	return true;
-}
-
 /***************************************************************************
  Purely internal function for make_server_info_info3
 ***************************************************************************/
diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index 44ae909..2754e86 100644
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -232,7 +232,6 @@ NTSTATUS make_session_info_guest(TALLOC_CTX *mem_ctx,
 NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
 				 struct auth_session_info **session_info);
 const struct auth_session_info *get_session_info_system(void);
-bool copy_current_user(struct current_user *dst, struct current_user *src);
 struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
 			     char **p_save_username, bool create );
 NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 356a08f..018b2cc 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -41,7 +41,7 @@ struct deferred_open_record {
 /****************************************************************************
  If the requester wanted DELETE_ACCESS and was rejected because
  the file ACL didn't include DELETE_ACCESS, see if the parent ACL
- ovverrides this.
+ overrides this.
 ****************************************************************************/
 
 static bool parent_override_delete(connection_struct *conn,
diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c
index 5c454c6..66092d2 100644
--- a/source4/torture/raw/session.c
+++ b/source4/torture/raw/session.c
@@ -40,6 +40,7 @@ static bool test_session_reauth(struct torture_context *tctx,
 	bool ok = true;
 
 	data = generate_random_str(tctx, dlen);
+	torture_assert(tctx, (data != NULL), "memory allocation failed");
 	snprintf(fname, sizeof(fname), "raw_session_reconnect_%.8s.dat", data);
 
 	fnum = smbcli_nt_create_full(cli->tree, fname, 0,


-- 
Samba Shared Repository