[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  299c13b s3:passdb fix a compiler warning
       via  a9c981e s3:vfs fix compiler warning
       via  1d069ed s3:lib fix compiler warnings
      from  d3b4c2c UTIL_TDB: lowercase name.

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


- Log -----------------------------------------------------------------
commit 299c13b7f60f2e3faaf73d6b3370acf99021963d
Author: Christian Ambach <ambi at samba.org>
Date:   Thu May 3 18:34:32 2012 +0200

    s3:passdb fix a compiler warning
    
    this one could have caused crashes
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Thu May  3 23:22:05 CEST 2012 on sn-devel-104

commit a9c981ec0be93f0072250ba6b92a53dc5636f422
Author: Christian Ambach <ambi at samba.org>
Date:   Thu May 3 18:32:06 2012 +0200

    s3:vfs fix compiler warning
    
    vfs_default.c:1875:10: warning: no previous prototype for 'vfswrap_audit_file'

commit 1d069ed80696452b1a78298d8aff22e6c22e2c3c
Author: Christian Ambach <ambi at samba.org>
Date:   Thu May 3 18:30:38 2012 +0200

    s3:lib fix compiler warnings
    
    g_lock.c:182:20: warning: no previous prototype for ‘g_lock_lock_send’
    g_lock.c:270:10: warning: no previous prototype for ‘g_lock_lock_recv’

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

Summary of changes:
 source3/include/g_lock.h |    6 ++++++
 source3/include/vfs.h    |    5 +++++
 source3/passdb/pdb_ads.c |    2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/g_lock.h b/source3/include/g_lock.h
index 1ac8418..004c452 100644
--- a/source3/include/g_lock.h
+++ b/source3/include/g_lock.h
@@ -32,6 +32,12 @@ enum g_lock_type {
 struct g_lock_ctx *g_lock_ctx_init(TALLOC_CTX *mem_ctx,
 				   struct messaging_context *msg);
 
+struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx,
+				    struct tevent_context *ev,
+				    struct g_lock_ctx *ctx,
+				    const char *name,
+				    enum g_lock_type type);
+NTSTATUS g_lock_lock_recv(struct tevent_req *req);
 NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
 		     enum g_lock_type lock_type, struct timeval timeout);
 NTSTATUS g_lock_unlock(struct g_lock_ctx *ctx, const char *name);
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index b5f234a..92f6ecd 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -749,6 +749,11 @@ NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
 				  struct files_struct *fsp,
 				  uint32 security_info_sent,
 				  const struct security_descriptor *psd);
+NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
+				 struct smb_filename *file,
+				 struct security_acl *sacl,
+				 uint32_t access_requested,
+				 uint32_t access_denied);
 int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name,
 			   mode_t mode);
 int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle,
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index f88ad75..df9b7b3 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -2258,7 +2258,7 @@ static bool pdb_ads_sid_to_id(struct pdb_methods *m, const struct dom_sid *sid,
 	} else {
 		gid_t gid;
 		id->type = ID_TYPE_GID;
-		if (!tldap_pull_uint32(msg[0], "gidNumber", gid)) {
+		if (!tldap_pull_uint32(msg[0], "gidNumber", &gid)) {
 			DEBUG(10, ("Did not find gidNumber\n"));
 			goto fail;
 		}


-- 
Samba Shared Repository