[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e82ac86... s4:net_drs_bind: make some more stuff static
       via  eee9811... s4:net/drs: use the full path to "utils/net/drs/net_drs*.h"
      from  44f75ed... s3: notify_onelevel does not use seqnums, so don't open asking for it

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


- Log -----------------------------------------------------------------
commit e82ac8655e95e9df818d8b74c79c06f090a01d70
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 12 12:20:03 2010 +0100

    s4:net_drs_bind: make some more stuff static
    
    metze

commit eee98110b3c4f3a24465a71fc5ae7db891c2a46f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 12 12:19:15 2010 +0100

    s4:net/drs: use the full path to "utils/net/drs/net_drs*.h"
    
    This fixes the build with automatic dependecies.
    
    metze

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

Summary of changes:
 source4/utils/net/drs/net_drs.c      |    2 +-
 source4/utils/net/drs/net_drs.h      |    2 +-
 source4/utils/net/drs/net_drs_bind.c |    6 +++---
 source4/utils/net/drs/net_drs_kcc.c  |    2 +-
 source4/utils/net/net.c              |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/utils/net/drs/net_drs.c b/source4/utils/net/drs/net_drs.c
index c286843..fedbc6a 100644
--- a/source4/utils/net/drs/net_drs.c
+++ b/source4/utils/net/drs/net_drs.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
-#include "net_drs.h"
+#include "utils/net/drs/net_drs.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb_wrap.h"
 #include "system/filesys.h"
diff --git a/source4/utils/net/drs/net_drs.h b/source4/utils/net/drs/net_drs.h
index f5f3620..5bca47d 100644
--- a/source4/utils/net/drs/net_drs.h
+++ b/source4/utils/net/drs/net_drs.h
@@ -51,6 +51,6 @@ struct net_drs_context {
 };
 
 
-#include "net_drs_proto.h"
+#include "utils/net/drs/net_drs_proto.h"
 
 #endif /* NET_DRS_H_ */
diff --git a/source4/utils/net/drs/net_drs_bind.c b/source4/utils/net/drs/net_drs_bind.c
index 40b2d09..910974e 100644
--- a/source4/utils/net/drs/net_drs_bind.c
+++ b/source4/utils/net/drs/net_drs_bind.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "utils/net/net.h"
-#include "net_drs.h"
+#include "utils/net/drs/net_drs.h"
 
 
 #define DEFINE_FLAG(_flag, _win_name) {_flag, #_flag, _win_name}
@@ -32,7 +32,7 @@ struct drs_extension_flag {
 	const char 	*win_name;
 };
 
-const struct drs_extension_flag drs_repl_flags[] = {
+static const struct drs_extension_flag drs_repl_flags[] = {
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_BASE, 			"DRS_EXT_BASE"),
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION, 	"DRS_EXT_ASYNCREPL"),
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI, 		"DRS_EXT_REMOVEAPI"),
@@ -69,7 +69,7 @@ const struct drs_extension_flag drs_repl_flags[] = {
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART3,		"DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART3")
 };
 
-const struct drs_extension_flag drs_repl_flags_ex[] = {
+static const struct drs_extension_flag drs_repl_flags_ex[] = {
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_ADAM,			"DRS_EXT_ADAM"),
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2,		"DRS_EXT_LH_BETA2"),
 	DEFINE_FLAG(DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN,		"DRS_EXT_RECYCLE_BIN")
diff --git a/source4/utils/net/drs/net_drs_kcc.c b/source4/utils/net/drs/net_drs_kcc.c
index 059b26f..5be1ba4 100644
--- a/source4/utils/net/drs/net_drs_kcc.c
+++ b/source4/utils/net/drs/net_drs_kcc.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "utils/net/net.h"
-#include "net_drs.h"
+#include "utils/net/drs/net_drs.h"
 #include "lib/ldb/include/ldb.h"
 
 
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 79b6ad8..62d7afc 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -51,7 +51,7 @@
 #include "lib/events/events.h"
 #include "auth/credentials/credentials.h"
 #include "scripting/python/modules.h"
-#include "drs/net_drs.h"
+#include "utils/net/drs/net_drs.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5


-- 
Samba Shared Repository