(merge from 3.0)

nsswitch/winbindd_util.c:
	add static

smbd/uid.c:
	remove unused function

Andrew Bartlett
(This used to be commit 4822a3f73610f6e468c447f1282246f13a378cde)

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 076ab1a2fc3528fde1be16537f5249082282753b..eecb36a30fcbca3300b417d88244eafc283bf642 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -200,7 +200,7 @@ void rescan_trusted_domains( void )
   rescan our domains looking for new trusted domains
 ********************************************************************/
 
-void add_trusted_domains( struct winbindd_domain *domain )
+static void add_trusted_domains( struct winbindd_domain *domain )
 {
        TALLOC_CTX *mem_ctx;
        NTSTATUS result;

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 09cf8995220c679b161ef34072d15a2c92d03549..f3d9004dd9f8fae2c30d0da663f09708c408eb89 100644 (file)
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -310,17 +310,6 @@ static void pop_conn_ctx(void)
        ctx_p->vuid = UID_FIELD_INVALID;
 }
 
-void init_conn_ctx(void)
-{
-    int i;
- 
-    /* Initialise connection context stack */
-       for (i = 0; i < MAX_SEC_CTX_DEPTH; i++) {
-               conn_ctx_stack[i].conn = NULL;
-               conn_ctx_stack[i].vuid = UID_FIELD_INVALID;
-    }
-}
-
 /****************************************************************************
  Temporarily become a root user.  Must match with unbecome_root(). Saves and
  restores the connection context.