diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-06-10 12:27:05 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-06-10 12:27:05 +0000 |
commit | e2a76a7fc94dd59c09bba3cda91446fad9f8c0e0 (patch) | |
tree | 76a7daa7431afb0ecc472fc337dd0820f5a9b283 | |
parent | 5a8d573f1784b037fd848d85a96dabfebfad63fd (diff) | |
download | samba-e2a76a7fc94dd59c09bba3cda91446fad9f8c0e0.tar.gz samba-e2a76a7fc94dd59c09bba3cda91446fad9f8c0e0.tar.xz samba-e2a76a7fc94dd59c09bba3cda91446fad9f8c0e0.zip |
Remove "sids.h" as it really wasn't being used anywhere, and was exporting
the (now static) global_sam_sid.
The only place it was being used was to return global_sid_NULL to some
uid->sid functions - and I'm not convinced this is correct in any case.
Andrew Bartlett
-rw-r--r-- | source/include/ntdomain.h | 1 | ||||
-rw-r--r-- | source/include/sids.h | 39 | ||||
-rw-r--r-- | source/lib/util_seaccess.c | 2 | ||||
-rw-r--r-- | source/nsswitch/wb_client.c | 1 | ||||
-rw-r--r-- | source/nsswitch/winbindd_sid.c | 1 | ||||
-rw-r--r-- | source/nsswitch/winbindd_util.c | 1 |
6 files changed, 1 insertions, 44 deletions
diff --git a/source/include/ntdomain.h b/source/include/ntdomain.h index 57eb4f43311..ffb9c96b725 100644 --- a/source/include/ntdomain.h +++ b/source/include/ntdomain.h @@ -374,6 +374,5 @@ struct acct_info #include "rpc_wkssvc.h" #include "rpc_spoolss.h" #include "rpc_dfs.h" -#include "sids.h" #endif /* _NT_DOMAIN_H */ diff --git a/source/include/sids.h b/source/include/sids.h deleted file mode 100644 index 279fd86f80a..00000000000 --- a/source/include/sids.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB parameters and setup - Copyright (C) Andrew Tridgell 1992-2000 - Copyright (C) Luke Kenneth Casson Leighton 1996-2000 - Copyright (C) Elrond 2000 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef _SIDS_H -#define _SIDS_H - -extern DOM_SID *global_sam_sid; -extern fstring global_sam_name; - -extern DOM_SID global_member_sid; - -extern DOM_SID global_sid_S_1_5_32; /* local well-known domain */ -extern DOM_SID global_sid_S_1_1; /* Global Domain */ -extern DOM_SID global_sid_NULL; - -extern const DOM_SID *global_sid_everyone; -extern const DOM_SID *global_sid_system; /* SYSTEM */ -extern const DOM_SID *global_sid_builtin; - -#endif /* _SIDS_H */ diff --git a/source/lib/util_seaccess.c b/source/lib/util_seaccess.c index 8ed266acedd..9fdf03adfc8 100644 --- a/source/lib/util_seaccess.c +++ b/source/lib/util_seaccess.c @@ -20,8 +20,6 @@ */ #include "includes.h" -#include "nterr.h" -#include "sids.h" /********************************************************************************** Check if this ACE has a SID in common with the token. diff --git a/source/nsswitch/wb_client.c b/source/nsswitch/wb_client.c index 9e34ecdd0d0..941d54a4c8a 100644 --- a/source/nsswitch/wb_client.c +++ b/source/nsswitch/wb_client.c @@ -27,6 +27,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND +extern DOM_SID global_sid_NULL; /* NULL sid */ NSS_STATUS winbindd_request(int req_type, struct winbindd_request *request, diff --git a/source/nsswitch/winbindd_sid.c b/source/nsswitch/winbindd_sid.c index a41bf759160..b65b12922b3 100644 --- a/source/nsswitch/winbindd_sid.c +++ b/source/nsswitch/winbindd_sid.c @@ -21,7 +21,6 @@ */ #include "winbindd.h" -#include "sids.h" /* Convert a string */ diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c index 06804b3b43f..3030a2839ab 100644 --- a/source/nsswitch/winbindd_util.c +++ b/source/nsswitch/winbindd_util.c @@ -22,7 +22,6 @@ */ #include "winbindd.h" -#include "sids.h" /** * @file winbindd_util.c |