summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-10 13:41:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:23 -0500
commita0fa5051bdb30d2d5e6d106f7c67c00211c93341 (patch)
tree22969f1f29e340ca8cafcaa4b231daee3ab545ee
parent1cc770fc588b86b5162689c7acdafa05b745f059 (diff)
downloadsamba-a0fa5051bdb30d2d5e6d106f7c67c00211c93341.tar.gz
samba-a0fa5051bdb30d2d5e6d106f7c67c00211c93341.tar.bz2
samba-a0fa5051bdb30d2d5e6d106f7c67c00211c93341.zip
r23816: A little more static, but leave the dead code testjoin.c as documentation.
Andrew Bartlett (This used to be commit 6679003c0553804333f0090a91e1fe53837ceb47)
-rw-r--r--source4/ldap_server/ldap_backend.c2
-rw-r--r--source4/libcli/auth/session.c2
-rw-r--r--source4/torture/rpc/testjoin.c14
3 files changed, 5 insertions, 13 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index be11a47f87..2f5e4348e1 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -118,7 +118,7 @@ void ldapsrv_queue_reply(struct ldapsrv_call *call, struct ldapsrv_reply *reply)
DLIST_ADD_END(call->replies, reply, struct ldapsrv_reply *);
}
-NTSTATUS ldapsrv_unwilling(struct ldapsrv_call *call, int error)
+static NTSTATUS ldapsrv_unwilling(struct ldapsrv_call *call, int error)
{
struct ldapsrv_reply *reply;
struct ldap_ExtendedResponse *r;
diff --git a/source4/libcli/auth/session.c b/source4/libcli/auth/session.c
index 4a9d79c425..7f44b6b5a9 100644
--- a/source4/libcli/auth/session.c
+++ b/source4/libcli/auth/session.c
@@ -29,7 +29,7 @@
before calling, the out blob must be initialised to be the same size
as the in blob
*/
-void sess_crypt_blob(DATA_BLOB *out, const DATA_BLOB *in, const DATA_BLOB *session_key,
+static void sess_crypt_blob(DATA_BLOB *out, const DATA_BLOB *in, const DATA_BLOB *session_key,
BOOL forward)
{
int i, k;
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index a4f6a3207c..31d782ae24 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -420,7 +420,7 @@ struct policy_handle *torture_join_samr_user_policy(struct test_join *join)
return &join->user_handle;
}
-NTSTATUS torture_leave_ads_domain(TALLOC_CTX *mem_ctx, struct libnet_JoinDomain *libnet_r)
+static NTSTATUS torture_leave_ads_domain(TALLOC_CTX *mem_ctx, struct libnet_JoinDomain *libnet_r)
{
int rtn;
TALLOC_CTX *tmp_ctx;
@@ -549,6 +549,7 @@ const char *torture_join_dom_dns_name(struct test_join *join)
}
+#if 0 /* Left as the documentation of the join process, but see new implementation in libnet_become_dc.c */
struct test_join_ads_dc {
struct test_join *join;
};
@@ -668,14 +669,5 @@ struct test_join_ads_dc *torture_join_domain_ads_dc(const char *machine_name,
/* W2K3: see libnet/libnet_become_dc.c */
return join;
}
-
-void torture_leave_domain_ads_dc(struct test_join_ads_dc *join)
-{
-/* W2K3: see libnet/libnet_unbecome_dc.c */
-
- if (join->join) {
- torture_leave_domain(join->join);
- }
- talloc_free(join);
-}
+#endif