[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon Oct 11 21:36:01 MDT 2010


The branch, master has been updated
       via  5742f51 libcli/security Use common security.h
       via  9111694 s4-credentials Allocate ldb result on correct memory context
       via  8beaa29 s4-libcli/security Use seperate subsystem for session related functions
       via  0487ef0 libcli/security Add debug class to security_token_debug() et al
       via  d406e51 lib/debug Add DEBUGC and DEBUGADDC as dummies
       via  ae52f95 libcli/security Move most of security_token.c to common code.
      from  4e1966d autobuild: send email failure if rebase fails

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


- Log -----------------------------------------------------------------
commit 5742f5115cc5102a668f8debc86deec23a4081f1
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 20 17:42:13 2010 +1000

    libcli/security Use common security.h
    
    This includes dom_sid.h and security_token.h and will be moved
    to the top level shortly.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Tue Oct 12 03:35:36 UTC 2010 on sn-devel-104

commit 911169451b0f801c3fbe4c698d74e9801d973ee0
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 12 10:05:32 2010 +1100

    s4-credentials Allocate ldb result on correct memory context

commit 8beaa2924205cf6b01bc6183f7795571a3966ba5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 20 14:49:39 2010 +1000

    s4-libcli/security Use seperate subsystem for session related functions
    
    The merged I plan in this area require spliting security.h into
    two header files, a common header and a session.h for the
    remaining source4-specific code.
    
    Andrew Bartlett

commit 0487ef0a70a9758da31cff0832ee8decbeb92e82
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Sep 17 15:23:19 2010 +1000

    libcli/security Add debug class to security_token_debug() et al
    
    This will allow it to replace functions in source3 that use debug classes.
    
    Andrew Bartlett

commit d406e511a5f46b7212584b23d17e97508e7f537b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Sep 17 15:18:57 2010 +1000

    lib/debug Add DEBUGC and DEBUGADDC as dummies
    
    This allows code that needs to also compile against the source3
    debug code to compile in source4.
    
    Andrew Bartlett

commit ae52f953af457c86e5e6db973fd89b2b5cd5b946
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Sep 17 12:59:24 2010 +1000

    libcli/security Move most of security_token.c to common code.
    
    The source4-specific session_info functions have been left in session.c
    
    Andrew Bartlett

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

Summary of changes:
 lib/util/debug.h                                   |    4 +
 libcli/security/privileges.c                       |   20 +++---
 libcli/security/privileges.h                       |    2 +-
 .../libcli => libcli}/security/security_token.c    |   69 ++++---------------
 libcli/security/security_token.h                   |   60 +++++++++++++++++
 libcli/security/wscript_build                      |    2 +-
 source4/auth/credentials/credentials_secrets.c     |    2 +-
 source4/auth/ntlm/auth_winbind.c                   |    2 +-
 source4/auth/session.c                             |    2 +-
 source4/dsdb/common/util_samr.c                    |    2 +-
 source4/dsdb/repl/drepl_out_pull.c                 |    2 +-
 source4/dsdb/repl/drepl_partitions.c               |    2 +-
 source4/dsdb/samdb/ldb_modules/extended_dn_out.c   |    2 +-
 source4/dsdb/samdb/ldb_modules/operational.c       |    2 +-
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c    |    4 +-
 source4/dsdb/samdb/ldb_modules/rootdse.c           |    1 +
 source4/dsdb/samdb/ldb_modules/util.c              |    1 +
 source4/dsdb/samdb/ldb_modules/wscript_build       |    6 +-
 source4/dsdb/samdb/samdb.c                         |    2 +-
 source4/libcli/finddcs_cldap.c                     |    2 +-
 source4/libcli/security/security.h                 |   12 +---
 source4/libcli/security/session.c                  |   65 ++++++++++++++++++
 .../{winbind/idmap.h => libcli/security/session.h} |   28 +++-----
 source4/libcli/security/wscript_build              |    8 ++-
 source4/libnet/libnet_vampire.c                    |    2 +-
 source4/rpc_server/drsuapi/addentry.c              |    1 +
 source4/rpc_server/drsuapi/dcesrv_drsuapi.c        |    3 +-
 source4/rpc_server/drsuapi/drsutil.c               |    5 +-
 source4/rpc_server/drsuapi/getncchanges.c          |    1 +
 source4/rpc_server/drsuapi/updaterefs.c            |    1 +
 source4/rpc_server/lsa/dcesrv_lsa.c                |    1 +
 source4/rpc_server/winreg/rpc_winreg.c             |    2 +-
 source4/rpc_server/wscript_build                   |    6 +-
 source4/smbd/service_named_pipe.c                  |    2 +-
 source4/torture/rpc/remote_pac.c                   |    2 +-
 source4/winbind/wb_cmd_getgroups.c                 |    2 +-
 36 files changed, 210 insertions(+), 120 deletions(-)
 rename {source4/libcli => libcli}/security/security_token.c (70%)
 create mode 100644 libcli/security/security_token.h
 create mode 100644 source4/libcli/security/session.c
 copy source4/{winbind/idmap.h => libcli/security/session.h} (63%)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug.h b/lib/util/debug.h
index fd2adcf..0172df8 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -63,6 +63,10 @@ extern int DEBUGLEVEL;
  */
 #define DEBUGADD(level, body) _DEBUG(level, body, false)
 
+/* Compatiblity macros for the source3 calling convention */
+#define DEBUGC(class, level, body) _DEBUG(level, body, true)
+#define DEBUGADDC(class, level, body) _DEBUG(level, body, false)
+
 /**
  * Obtain indentation string for the debug log. 
  *
diff --git a/libcli/security/privileges.c b/libcli/security/privileges.c
index 65000aa..5d4cf77 100644
--- a/libcli/security/privileges.c
+++ b/libcli/security/privileges.c
@@ -443,31 +443,33 @@ void security_token_set_right_bit(struct security_token *token, uint32_t right_b
 	token->rights_mask |= right_bit;
 }
 
-void security_token_debug_privileges(int dbg_lev, const struct security_token *token)
+void security_token_debug_privileges(int dbg_class, int dbg_lev, const struct security_token *token)
 {
-	DEBUGADD(dbg_lev, (" Privileges (0x%16llX):\n",
-			    (unsigned long long) token->privilege_mask));
+	DEBUGADDC(dbg_class, dbg_lev, (" Privileges (0x%16llX):\n",
+				       (unsigned long long) token->privilege_mask));
 
 	if (token->privilege_mask) {
 		int idx = 0;
 		int i = 0;
 		for (idx = 0; idx<ARRAY_SIZE(privs); idx++) {
 			if (token->privilege_mask & privs[idx].privilege_mask) {
-				DEBUGADD(dbg_lev, ("  Privilege[%3lu]: %s\n", (unsigned long)i++,
-						   privs[idx].name));
+				DEBUGADDC(dbg_class, dbg_lev,
+					  ("  Privilege[%3lu]: %s\n", (unsigned long)i++,
+					   privs[idx].name));
 			}
 		}
 	}
-	DEBUGADD(dbg_lev, (" Rights (0x%16lX):\n",
-			    (unsigned long) token->rights_mask));
+	DEBUGADDC(dbg_class, dbg_lev, (" Rights (0x%16lX):\n",
+				       (unsigned long) token->rights_mask));
 
 	if (token->rights_mask) {
 		int idx = 0;
 		int i = 0;
 		for (idx = 0; idx<ARRAY_SIZE(rights); idx++) {
 			if (token->rights_mask & rights[idx].right_mask) {
-				DEBUGADD(dbg_lev, ("  Right[%3lu]: %s\n", (unsigned long)i++,
-						   rights[idx].name));
+				DEBUGADDC(dbg_class, dbg_lev,
+					  ("  Right[%3lu]: %s\n", (unsigned long)i++,
+					   rights[idx].name));
 			}
 		}
 	}
diff --git a/libcli/security/privileges.h b/libcli/security/privileges.h
index f67a38b..a65dbdf 100644
--- a/libcli/security/privileges.h
+++ b/libcli/security/privileges.h
@@ -98,6 +98,6 @@ void security_token_set_privilege(struct security_token *token, enum sec_privile
 */
 void security_token_set_right_bit(struct security_token *token, uint32_t right_bit);
 
-void security_token_debug_privileges(int dbg_lev, const struct security_token *token);
+void security_token_debug_privileges(int dbg_class, int dbg_lev, const struct security_token *token);
 
 #endif /* PRIVILEGES_H */
diff --git a/source4/libcli/security/security_token.c b/libcli/security/security_token.c
similarity index 70%
rename from source4/libcli/security/security_token.c
rename to libcli/security/security_token.c
index 9d37475..03dc528 100644
--- a/source4/libcli/security/security_token.c
+++ b/libcli/security/security_token.c
@@ -1,28 +1,30 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    security descriptor utility functions
 
    Copyright (C) Andrew Tridgell 		2004
+   Copyright (C) Andrew Bartlett 		2010
    Copyright (C) Stefan Metzmacher 		2005
-      
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "libcli/security/security.h"
-#include "auth/session.h"
+#include "libcli/security/security_token.h"
+#include "libcli/security/dom_sid.h"
+#include "libcli/security/privileges.h"
 
 /*
   return a blank security token
@@ -42,13 +44,13 @@ struct security_token *security_token_initialise(TALLOC_CTX *mem_ctx)
 /****************************************************************************
  prints a struct security_token to debug output.
 ****************************************************************************/
-void security_token_debug(int dbg_lev, const struct security_token *token)
+void security_token_debug(int dbg_class, int dbg_lev, const struct security_token *token)
 {
 	TALLOC_CTX *mem_ctx;
 	uint32_t i;
 
 	if (!token) {
-		DEBUG(dbg_lev, ("Security token: (NULL)\n"));
+		DEBUGC(dbg_class, dbg_lev, ("Security token: (NULL)\n"));
 		return;
 	}
 
@@ -57,14 +59,14 @@ void security_token_debug(int dbg_lev, const struct security_token *token)
 		return;
 	}
 
-	DEBUG(dbg_lev, ("Security token SIDs (%lu):\n", 
+	DEBUGC(dbg_class, dbg_lev, ("Security token SIDs (%lu):\n",
 				       (unsigned long)token->num_sids));
 	for (i = 0; i < token->num_sids; i++) {
-		DEBUGADD(dbg_lev, ("  SID[%3lu]: %s\n", (unsigned long)i, 
+		DEBUGADDC(dbg_class, dbg_lev, ("  SID[%3lu]: %s\n", (unsigned long)i,
 			   dom_sid_string(mem_ctx, &token->sids[i])));
 	}
 
-	security_token_debug_privileges(dbg_lev, token);
+	security_token_debug_privileges(dbg_class, dbg_lev, token);
 
 	talloc_free(mem_ctx);
 }
@@ -91,12 +93,12 @@ bool security_token_is_sid_string(const struct security_token *token, const char
 	return ret;
 }
 
-bool security_token_is_system(const struct security_token *token) 
+bool security_token_is_system(const struct security_token *token)
 {
 	return security_token_is_sid_string(token, SID_NT_SYSTEM);
 }
 
-bool security_token_is_anonymous(const struct security_token *token) 
+bool security_token_is_anonymous(const struct security_token *token)
 {
 	return security_token_is_sid_string(token, SID_NT_ANONYMOUS);
 }
@@ -138,44 +140,3 @@ bool security_token_has_enterprise_dcs(const struct security_token *token)
 {
 	return security_token_has_sid_string(token, SID_NT_ENTERPRISE_DCS);
 }
-
-enum security_user_level security_session_user_level(struct auth_session_info *session_info,
-						     const struct dom_sid *domain_sid)
-{
-	if (!session_info) {
-		return SECURITY_ANONYMOUS;
-	}
-	
-	if (security_token_is_system(session_info->security_token)) {
-		return SECURITY_SYSTEM;
-	}
-
-	if (security_token_is_anonymous(session_info->security_token)) {
-		return SECURITY_ANONYMOUS;
-	}
-
-	if (security_token_has_builtin_administrators(session_info->security_token)) {
-		return SECURITY_ADMINISTRATOR;
-	}
-
-	if (domain_sid) {
-		struct dom_sid *rodc_dcs;
-		rodc_dcs = dom_sid_add_rid(session_info, domain_sid, DOMAIN_RID_READONLY_DCS);
-		if (security_token_has_sid(session_info->security_token, rodc_dcs)) {
-			talloc_free(rodc_dcs);
-			return SECURITY_RO_DOMAIN_CONTROLLER;
-		}
-		talloc_free(rodc_dcs);
-	}
-
-	if (security_token_has_enterprise_dcs(session_info->security_token)) {
-		return SECURITY_DOMAIN_CONTROLLER;
-	}
-
-	if (security_token_has_nt_authenticated_users(session_info->security_token)) {
-		return SECURITY_USER;
-	}
-
-	return SECURITY_ANONYMOUS;
-}
-
diff --git a/libcli/security/security_token.h b/libcli/security/security_token.h
new file mode 100644
index 0000000..b8ca990
--- /dev/null
+++ b/libcli/security/security_token.h
@@ -0,0 +1,60 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   security descriptor utility functions
+
+   Copyright (C) Andrew Tridgell 		2004
+   Copyright (C) Andrew Bartlett 		2010
+   Copyright (C) Stefan Metzmacher 		2005
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _LIBCLI_SECURITY_SECURITY_TOKEN_H_
+#define _LIBCLI_SECURITY_SECURITY_TOKEN_H_
+
+#include "librpc/gen_ndr/security.h"
+
+#define PRIMARY_USER_SID_INDEX 0
+#define PRIMARY_GROUP_SID_INDEX 1
+
+/*
+  return a blank security token
+*/
+struct security_token *security_token_initialise(TALLOC_CTX *mem_ctx);
+
+/****************************************************************************
+ prints a struct security_token to debug output.
+****************************************************************************/
+void security_token_debug(int dbg_class, int dbg_lev, const struct security_token *token);
+
+bool security_token_is_sid(const struct security_token *token, const struct dom_sid *sid);
+
+bool security_token_is_sid_string(const struct security_token *token, const char *sid_string);
+
+bool security_token_is_system(const struct security_token *token);
+
+bool security_token_is_anonymous(const struct security_token *token);
+
+bool security_token_has_sid(const struct security_token *token, const struct dom_sid *sid);
+
+bool security_token_has_sid_string(const struct security_token *token, const char *sid_string);
+
+bool security_token_has_builtin_administrators(const struct security_token *token);
+
+bool security_token_has_nt_authenticated_users(const struct security_token *token);
+
+bool security_token_has_enterprise_dcs(const struct security_token *token);
+
+#endif
diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 8efb751..5dac901 100644
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -2,7 +2,7 @@
 
 
 bld.SAMBA_SUBSYSTEM('LIBSECURITY_COMMON',
-	source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c',
+	source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c',
 	deps='talloc LIBNDR'
 	)
 
diff --git a/source4/auth/credentials/credentials_secrets.c b/source4/auth/credentials/credentials_secrets.c
index 0f30dc5..8c8043c 100644
--- a/source4/auth/credentials/credentials_secrets.c
+++ b/source4/auth/credentials/credentials_secrets.c
@@ -83,7 +83,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
 		}
 	}
 
-	ldb_ret = dsdb_search_one(ldb, ldb, &msg,
+	ldb_ret = dsdb_search_one(ldb, mem_ctx, &msg,
 				  ldb_dn_new(mem_ctx, ldb, base),
 				  LDB_SCOPE_SUBTREE,
 				  NULL, 0, "%s", filter);
diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index 0dc52b9..b6bf516 100644
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/auth_winbind.c
@@ -29,7 +29,7 @@
 #include "lib/messaging/irpc.h"
 #include "param/param.h"
 #include "nsswitch/libwbclient/wbclient.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 
 static NTSTATUS get_info3_from_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 					       struct wbcAuthUserInfo *info,
diff --git a/source4/auth/session.c b/source4/auth/session.c
index ce7ea3b..dce00b9 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -213,6 +213,6 @@ void auth_session_info_debug(int dbg_lev,
 		return;	
 	}
 
-	security_token_debug(dbg_lev, session_info->security_token);
+	security_token_debug(0, dbg_lev, session_info->security_token);
 }
 
diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 85bfbfd..c50b33c 100644
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -26,7 +26,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
 #include "../libds/common/flags.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 
 /* Add a user, SAMR style, including the correct transaction
  * semantics.  Used by the SAMR server and by pdb_samba4 */
diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c
index c13dadc..3e59ee9 100644
--- a/source4/dsdb/repl/drepl_out_pull.c
+++ b/source4/dsdb/repl/drepl_out_pull.c
@@ -32,7 +32,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "libcli/composite/composite.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 
 WERROR dreplsrv_schedule_partition_pull_source(struct dreplsrv_service *s,
 					       struct dreplsrv_partition_source_dsa *source,
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index fd0ffd9..e272747 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -31,7 +31,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "param/param.h"
 
 WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index 2daae25..3126dd2 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -35,7 +35,7 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_module.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/ndr/libndr.h"
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 687597d..633fd8d 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -74,7 +74,7 @@
 #include "dsdb/samdb/ldb_modules/util.h"
 
 #include "auth/auth.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index fdb1941..0ee7996 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -44,11 +44,11 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "lib/util/dlinklist.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "lib/util/binsearch.h"
-#include "libcli/security/security.h"
+#include "libcli/security/session.h"
 #include "lib/util/tsort.h"
 
 struct replmd_private {
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 6c2a1e6..7334bf3 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -28,6 +28,7 @@
 #include "version.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
+#include "libcli/security/session.h"
 #include "librpc/ndr/libndr.h"
 #include "auth/auth.h"
 #include "param/param.h"
diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index d7bf807..2380e02 100644
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -28,6 +28,7 @@
 #include "util.h"
 #include "libcli/security/security.h"
 #include "lib/ldb/include/ldb_private.h"
+#include "libcli/security/session.h"
 
 /*
   search for attrs on one DN, in the modules below
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 95c3273..dc143f5 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
 	source='util.c acl_util.c',
 	autoproto='util_proto.h',
-	deps='ldb LIBNDR SAMDB_COMMON'
+	deps='ldb LIBNDR SAMDB_COMMON LIBSECURITY_SESSION'
 	)
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -50,7 +50,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
 	subsystem='ldb',
 	init_function='LDB_MODULE(repl_meta_data)',
 	internal_module=False,
-	deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS'
+	deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS LIBSECURITY_SESSION'
 	)
 
 
@@ -141,7 +141,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
 	subsystem='ldb',
 	init_function='LDB_MODULE(rootdse)',
 	internal_module=False,
-	deps='talloc LIBEVENTS SAMDB MESSAGING'
+	deps='talloc LIBEVENTS SAMDB MESSAGING LIBSECURITY_SESSION'
 	)
 
 
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index d8c1728..c7d2c30 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -230,7 +230,7 @@ NTSTATUS security_token_create(TALLOC_CTX *mem_ctx,
 		return status;
 	}
 
-	security_token_debug(10, ptoken);
+	security_token_debug(0, 10, ptoken);
 
 	*token = ptoken;
 
diff --git a/source4/libcli/finddcs_cldap.c b/source4/libcli/finddcs_cldap.c
index 4129ce2..011d35d 100644
--- a/source4/libcli/finddcs_cldap.c
+++ b/source4/libcli/finddcs_cldap.c
@@ -27,7 +27,7 @@
 #include "libcli/libcli.h"
 #include "libcli/cldap/cldap.h"
 #include "libcli/finddc.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "libcli/composite/composite.h"
 
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
index dc5e3ca..009ad64 100644
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -25,17 +25,6 @@
 #define PRIMARY_USER_SID_INDEX 0
 #define PRIMARY_GROUP_SID_INDEX 1


-- 
Samba Shared Repository


More information about the samba-cvs mailing list