diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-02-08 12:06:05 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-02-08 12:06:05 +0000 |
| commit | 119cbcde624629f86e552dff91825bc4a3c92052 (patch) | |
| tree | acf1a4c72e158b7da814040c15339252e271e3e3 | |
| parent | 37ef59d4c323a068b978b6beecef367f736b4a86 (diff) | |
| download | samba-119cbcde624629f86e552dff91825bc4a3c92052.tar.gz samba-119cbcde624629f86e552dff91825bc4a3c92052.tar.bz2 samba-119cbcde624629f86e552dff91825bc4a3c92052.zip | |
(merge from 3.0)
nsswitch/winbindd_util.c:
add static
smbd/uid.c:
remove unused function
Andrew Bartlett
(This used to be commit 4822a3f73610f6e468c447f1282246f13a378cde)
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 2 | ||||
| -rw-r--r-- | source3/smbd/uid.c | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 076ab1a2fc..eecb36a30f 100644 --- 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 09cf899522..f3d9004dd9 100644 --- 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. |