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
(This used to be commit e2a76a7fc94dd59c09bba3cda91446fad9f8c0e0)

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 57eb4f43311acdb519d342e94cb2544f1cba4f3b..ffb9c96b72528ba04a4a9fca6f75f6600be1946e 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/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/source3/include/sids.h b/source3/include/sids.h
deleted file mode 100644 (file)
index 279fd86..0000000
--- a/source3/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/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index 8ed266acedd4492a1cad96bfd2d9f5355d066c3a..9fdf03adfc8b13c0eb79ada6b9c86146628adfca 100644 (file)
--- a/source3/lib/util_seaccess.c
+++ b/source3/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/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index 9e34ecdd0d0fca5ea32bae4f3db55670c0a343c4..941d54a4c8af88d2f8a64db3ff0cfb10978f9669 100644 (file)
--- a/source3/nsswitch/wb_client.c
+++ b/source3/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/source3/nsswitch/winbindd_sid.c b/source3/nsswitch/winbindd_sid.c
index a41bf759160d52f5e2d87997413581ddc95f0458..b65b12922b3059dd4a004bde282312c6f7e4ebb5 100644 (file)
--- a/source3/nsswitch/winbindd_sid.c
+++ b/source3/nsswitch/winbindd_sid.c
@@ -21,7 +21,6 @@
 */
 
 #include "winbindd.h"
-#include "sids.h"
 
 /* Convert a string  */
 

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 06804b3b43fe08352f97118192087a577e15f872..3030a2839ab3b2b995f77ec373038d6f7bcfb7f2 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -22,7 +22,6 @@
 */
 
 #include "winbindd.h"
-#include "sids.h"
 
 /**
  * @file winbindd_util.c