r838: got rid of rpc_misc.h
authorAndrew Tridgell <tridge@samba.org>
Mon, 24 May 2004 05:07:04 +0000 (05:07 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:53:54 +0000 (12:53 -0500)
(This used to be commit f61d333b2a280434181451ce735a05ad319a2515)

source4/include/rpc_misc.h [deleted file]
source4/include/smb.h
source4/param/loadparm.c

diff --git a/source4/include/rpc_misc.h b/source4/include/rpc_misc.h
deleted file mode 100644 (file)
index 430489a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   
-   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 _RPC_MISC_H /* _RPC_MISC_H */
-#define _RPC_MISC_H 
-
-
-
-/* well-known RIDs - Relative IDs */
-
-/* RIDs - Well-known users ... */
-#define DOMAIN_USER_RID_ADMIN          (0x000001F4L)
-#define DOMAIN_USER_RID_GUEST          (0x000001F5L)
-#define DOMAIN_USER_RID_KRBTGT         (0x000001F6L)
-
-/* RIDs - well-known groups ... */
-#define DOMAIN_GROUP_RID_ADMINS        (0x00000200L)
-#define DOMAIN_GROUP_RID_USERS         (0x00000201L)
-#define DOMAIN_GROUP_RID_GUESTS        (0x00000202L)
-#define DOMAIN_GROUP_RID_COMPUTERS     (0x00000203L)
-
-#define DOMAIN_GROUP_RID_CONTROLLERS   (0x00000204L)
-#define DOMAIN_GROUP_RID_CERT_ADMINS   (0x00000205L)
-#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (0x00000206L)
-#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (0x00000207L)
-
-/* is the following the right number? I bet it is  --simo
-#define DOMAIN_GROUP_RID_POLICY_ADMINS (0x00000208L)
-*/
-
-/* RIDs - well-known aliases ... */
-#define BUILTIN_ALIAS_RID_ADMINS        (0x00000220L)
-#define BUILTIN_ALIAS_RID_USERS         (0x00000221L)
-#define BUILTIN_ALIAS_RID_GUESTS        (0x00000222L)
-#define BUILTIN_ALIAS_RID_POWER_USERS   (0x00000223L)
-
-#define BUILTIN_ALIAS_RID_ACCOUNT_OPS   (0x00000224L)
-#define BUILTIN_ALIAS_RID_SYSTEM_OPS    (0x00000225L)
-#define BUILTIN_ALIAS_RID_PRINT_OPS     (0x00000226L)
-#define BUILTIN_ALIAS_RID_BACKUP_OPS    (0x00000227L)
-
-#define BUILTIN_ALIAS_RID_REPLICATOR    (0x00000228L)
-#define BUILTIN_ALIAS_RID_RAS_SERVERS   (0x00000229L)
-
-/*
- * Masks for mappings between unix uid and gid types and
- * NT RIDS.
- */
-
-
-#define BASE_RID (0x000003E8L)
-
-/* Take the bottom bit. */
-#define RID_TYPE_MASK 1
-#define RID_MULTIPLIER 2
-
-/* The two common types. */
-#define USER_RID_TYPE 0
-#define GROUP_RID_TYPE 1
-
-#endif /* _RPC_MISC_H */
index 3b173cbeb52053c99cd402b25f338c6bb781328b..e197698491418580408c1585cea5c66ed2c4c536 100644 (file)
@@ -934,7 +934,6 @@ struct pwd_info
        uchar sess_key[16];
 };
 
-#include "rpc_misc.h"
 #include "rpc_secdes.h"
 
 typedef struct user_struct
index f357703013923688e2ccdbb5113e5e0c40854ae0..f000509e4771e519955d0c51a9b27866b40c362a 100644 (file)
@@ -139,7 +139,6 @@ typedef struct
        char *szWinbindUID;
        char *szWinbindGID;
        char *szNonUnixAccountRange;
-       int AlgorithmicRidBase;
        char *szTemplateHomedir;
        char *szTemplateShell;
        char *szWinbindSeparator;
@@ -585,7 +584,6 @@ static struct parm_struct parm_table[] = {
        {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"passdb backend", P_LIST, P_GLOBAL, &Globals.szPassdbBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"algorithmic rid base", P_INTEGER, P_GLOBAL, &Globals.AlgorithmicRidBase, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root dir", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_HIDE | FLAG_DEVELOPER},
@@ -997,8 +995,6 @@ static void init_globals(void)
 
        string_set(&Globals.szPasswordServer, "*");
 
-       Globals.AlgorithmicRidBase = BASE_RID;
-
        Globals.bLoadPrinters = True;
        Globals.mangled_stack = 50;
        Globals.max_mux = 50;   /* This is *needed* for profile support. */
@@ -1375,7 +1371,6 @@ FN_LOCAL_INTEGER(lp_printing, iPrinting)
 FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
 FN_GLOBAL_BOOL(lp_hide_local_users, &Globals.bHideLocalUsers)
-FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
 FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
 FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)