svn commit: samba r23816 - in branches/SAMBA_4_0/source: ldap_server libcli/auth torture/rpc

[abartlet at samba.org]

Author: abartlet
Date: 2007-07-10 13:41:00 +0000 (Tue, 10 Jul 2007)
New Revision: 23816

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23816

Log:
A little more static, but leave the dead code testjoin.c as documentation.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
   branches/SAMBA_4_0/source/libcli/auth/session.c
   branches/SAMBA_4_0/source/torture/rpc/testjoin.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c	2007-07-10 13:26:10 UTC (rev 23815)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c	2007-07-10 13:41:00 UTC (rev 23816)
@@ -118,7 +118,7 @@
 	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;

Modified: branches/SAMBA_4_0/source/libcli/auth/session.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/session.c	2007-07-10 13:26:10 UTC (rev 23815)
+++ branches/SAMBA_4_0/source/libcli/auth/session.c	2007-07-10 13:41:00 UTC (rev 23816)
@@ -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;

Modified: branches/SAMBA_4_0/source/torture/rpc/testjoin.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/testjoin.c	2007-07-10 13:26:10 UTC (rev 23815)
+++ branches/SAMBA_4_0/source/torture/rpc/testjoin.c	2007-07-10 13:41:00 UTC (rev 23816)
@@ -420,7 +420,7 @@
 	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 @@
 }
 
 
+#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 @@
 /* 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