[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  6073d21 ldb_secrets_tdb_sync: Add dependency on gssapi.
       via  ed63300 dsdb: Rename _res argument to _result.
      from  ab30a8b provision: Make dsacl2fsacl() take a security.dom_sid, not str

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


- Log -----------------------------------------------------------------
commit 6073d214aa8bfeff8dae8cf151357f890dd37a48
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 6 01:25:00 2012 +0100

    ldb_secrets_tdb_sync: Add dependency on gssapi.
    
    This is required when building with the system heimdal, as
    gssapi/gssapi_spnego.h is included.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Nov  6 05:12:28 CET 2012 on sn-devel-104

commit ed6330094b47408f33c2d933e9c80b079dd891d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 6 01:24:59 2012 +0100

    dsdb: Rename _res argument to _result.
    
    Newer versions of heimdal include a macro that is unfortunately named
    '_res'. This change prevents the clash.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source4/dsdb/common/util.c                         |   12 ++++++------
 .../dsdb/samdb/ldb_modules/wscript_build_server    |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 086f2a5..632d5bf 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3845,7 +3845,7 @@ int dsdb_replace(struct ldb_context *ldb, struct ldb_message *msg, uint32_t dsdb
  */
 int dsdb_search_dn(struct ldb_context *ldb,
 		   TALLOC_CTX *mem_ctx,
-		   struct ldb_result **_res,
+		   struct ldb_result **_result,
 		   struct ldb_dn *basedn,
 		   const char * const *attrs,
 		   uint32_t dsdb_flags)
@@ -3890,7 +3890,7 @@ int dsdb_search_dn(struct ldb_context *ldb,
 		return ret;
 	}
 
-	*_res = res;
+	*_result = res;
 	return LDB_SUCCESS;
 }
 
@@ -3900,7 +3900,7 @@ int dsdb_search_dn(struct ldb_context *ldb,
  */
 int dsdb_search_by_dn_guid(struct ldb_context *ldb,
 			   TALLOC_CTX *mem_ctx,
-			   struct ldb_result **_res,
+			   struct ldb_result **_result,
 			   const struct GUID *guid,
 			   const char * const *attrs,
 			   uint32_t dsdb_flags)
@@ -3915,7 +3915,7 @@ int dsdb_search_by_dn_guid(struct ldb_context *ldb,
 		return ldb_oom(ldb);
 	}
 
-	ret = dsdb_search_dn(ldb, mem_ctx, _res, dn, attrs, dsdb_flags);
+	ret = dsdb_search_dn(ldb, mem_ctx, _result, dn, attrs, dsdb_flags);
 	talloc_free(tmp_ctx);
 	return ret;
 }
@@ -3925,7 +3925,7 @@ int dsdb_search_by_dn_guid(struct ldb_context *ldb,
  */
 int dsdb_search(struct ldb_context *ldb,
 		TALLOC_CTX *mem_ctx,
-		struct ldb_result **_res,
+		struct ldb_result **_result,
 		struct ldb_dn *basedn,
 		enum ldb_scope scope,
 		const char * const *attrs,
@@ -4003,7 +4003,7 @@ int dsdb_search(struct ldb_context *ldb,
 		}
 	}
 
-	*_res = talloc_steal(mem_ctx, res);
+	*_result = talloc_steal(mem_ctx, res);
 	talloc_free(tmp_ctx);
 
 	return LDB_SUCCESS;
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index 5d09c40..c23ad16 100755
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -205,7 +205,7 @@ bld.SAMBA_MODULE('ldb_secrets_tdb_sync',
 	init_function='ldb_secrets_tdb_sync_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='talloc secrets3 DSDB_MODULE_HELPERS dbwrap'
+	deps='talloc secrets3 DSDB_MODULE_HELPERS dbwrap gssapi'
 	)
 
 


-- 
Samba Shared Repository