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

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  32c992e9573c9af34cd142393287e2f3538d2dd9 (commit)
       via  ce1bd43cdae63ff05aefaded419388e7b9e3ba9a (commit)
       via  e04fc36f223d8d905a930c077a6cf6c48ee57af7 (commit)
       via  99d980125054cbfef8ec85a31e83aa18a6e0bce3 (commit)
      from  34dd8f32e1b7fe256ab5dfde5ef5bb8abeec121a (commit)

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


- Log -----------------------------------------------------------------
commit 32c992e9573c9af34cd142393287e2f3538d2dd9
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 28 12:05:54 2008 +0100

    Fix a confusing variable name

commit ce1bd43cdae63ff05aefaded419388e7b9e3ba9a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 27 22:54:10 2008 +0100

    Fix a memory leak

commit e04fc36f223d8d905a930c077a6cf6c48ee57af7
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 26 18:39:11 2008 +0100

    Make some fns static

commit 99d980125054cbfef8ec85a31e83aa18a6e0bce3
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 26 18:33:38 2008 +0100

    printclose has only 1 vwv

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

Summary of changes:
 source/include/dbwrap.h       |    4 ++--
 source/lib/sharesec.c         |    2 ++
 source/smbd/reply.c           |    2 +-
 source/winbindd/idmap_cache.c |   21 +++++----------------
 4 files changed, 10 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/dbwrap.h b/source/include/dbwrap.h
index 654c7a4..fe84709 100644
--- a/source/include/dbwrap.h
+++ b/source/include/dbwrap.h
@@ -34,11 +34,11 @@ struct db_context {
 	int (*fetch)(struct db_context *db, TALLOC_CTX *mem_ctx,
 		     TDB_DATA key, TDB_DATA *data);
 	int (*traverse)(struct db_context *db,
-			int (*f)(struct db_record *db,
+			int (*f)(struct db_record *rec,
 				 void *private_data),
 			void *private_data);
 	int (*traverse_read)(struct db_context *db,
-			     int (*f)(struct db_record *db,
+			     int (*f)(struct db_record *rec,
 				      void *private_data),
 			     void *private_data);
 	int (*get_seqnum)(struct db_context *db);
diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index 5a8984f..2338cca 100644
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -137,6 +137,8 @@ SEC_DESC *get_share_security( TALLOC_CTX *ctx, const char *servicename,
 
 	status = unmarshall_sec_desc(ctx, data.dptr, data.dsize, &psd);
 
+	SAFE_FREE(data.dptr);
+
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("unmarshall_sec_desc failed: %s\n",
 			  nt_errstr(status)));
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 91d5f25..bababfe 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -4622,7 +4622,7 @@ void reply_printclose(struct smb_request *req)
 
 	START_PROFILE(SMBsplclose);
 
-	if (req->wct < 3) {
+	if (req->wct < 1) {
 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
 		END_PROFILE(SMBsplclose);
 		return;
diff --git a/source/winbindd/idmap_cache.c b/source/winbindd/idmap_cache.c
index cf46196..f7e1d4e 100644
--- a/source/winbindd/idmap_cache.c
+++ b/source/winbindd/idmap_cache.c
@@ -70,12 +70,8 @@ struct idmap_cache_ctx *idmap_cache_init(TALLOC_CTX *memctx)
 	return cache;
 }
 
-void idmap_cache_shutdown(struct idmap_cache_ctx *cache)
-{
-	talloc_free(cache);
-}
-
-NTSTATUS idmap_cache_build_sidkey(TALLOC_CTX *ctx, char **sidkey, const struct id_map *id)
+static NTSTATUS idmap_cache_build_sidkey(TALLOC_CTX *ctx, char **sidkey,
+					 const struct id_map *id)
 {
 	fstring sidstr;
 
@@ -89,7 +85,8 @@ NTSTATUS idmap_cache_build_sidkey(TALLOC_CTX *ctx, char **sidkey, const struct i
 	return NT_STATUS_OK;
 }
 
-NTSTATUS idmap_cache_build_idkey(TALLOC_CTX *ctx, char **idkey, const struct id_map *id)
+static NTSTATUS idmap_cache_build_idkey(TALLOC_CTX *ctx, char **idkey,
+					const struct id_map *id)
 {
 	*idkey = talloc_asprintf(ctx, "IDMAP/%s/%lu",
 				(id->xid.type==ID_TYPE_UID)?"UID":"GID",
@@ -256,7 +253,7 @@ done:
 	return ret;
 }
 
-NTSTATUS idmap_cache_fill_map(struct id_map *id, const char *value)
+static NTSTATUS idmap_cache_fill_map(struct id_map *id, const char *value)
 {
 	char *rem;
 
@@ -304,14 +301,6 @@ failed:
 	return NT_STATUS_INTERNAL_DB_CORRUPTION;
 }
 
-bool idmap_cache_is_negative(const char *val)
-{
-	if ( ! strcmp("IDMAP/NEGATIVE", val)) {
-		return True;
-	}
-	return False;
-}
-
 /* search the cahce for the SID an return a mapping if found *
  *
  * 4 cases are possible


-- 
Samba Shared Repository