diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/Makefile.in | 20 | ||||
| -rw-r--r-- | source4/include/genparser.h | 4 | ||||
| -rw-r--r-- | source4/include/genparser_samba.h | 4 | ||||
| -rw-r--r-- | source4/include/includes.h | 7 | ||||
| -rw-r--r-- | source4/include/intl.h | 24 | ||||
| -rw-r--r-- | source4/include/ntdomain.h | 31 | ||||
| -rw-r--r-- | source4/include/rpc_creds.h | 4 | ||||
| -rw-r--r-- | source4/include/rpc_lsa.h | 4 | ||||
| -rw-r--r-- | source4/include/rpc_misc.h | 2 | ||||
| -rw-r--r-- | source4/include/session.h | 40 | ||||
| -rw-r--r-- | source4/include/smb.h | 120 | ||||
| -rw-r--r-- | source4/include/smb_acls.h | 4 | ||||
| -rw-r--r-- | source4/include/smb_macros.h | 107 | ||||
| -rw-r--r-- | source4/lib/smbrun.c | 12 | ||||
| -rw-r--r-- | source4/lib/talloctort.c | 4 | ||||
| -rw-r--r-- | source4/lib/util_seaccess.c | 4 |
16 files changed, 49 insertions, 342 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 887b9b24ea..41349df249 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -117,7 +117,7 @@ LIB_OBJ = lib/version.o lib/charcnv.o lib/debug.o lib/fault.o \ nsswitch/wb_client.o nsswitch/wb_common.o \ lib/pam_errors.o intl/lang_tdb.o lib/account_pol.o \ lib/gencache.o $(TDB_OBJ) \ - lib/module.o lib/genparser.o \ + lib/module.o \ lib/ldap_escape.o lib/events.o lib/mutex.o LIB_SMBD_OBJ = lib/util_smbd.o $(LIB_OBJ) @@ -218,15 +218,15 @@ SMBD_RPC_OBJ = rpc_server/dcerpc_server.o rpc_server/dcesrv_auth.o \ rpc_server/dcerpc_tcp.o rpc_server/handles.o @DCERPC_STATIC@ SMBD_OBJ_SRV = smbd/connection.o \ - smbd/session.o \ - smbd/password.o smbd/conn.o \ - smbd/negprot.o smbd/request.o \ - smbd/reply.o smbd/sesssetup.o \ - smbd/trans2.o smbd/search.o smbd/nttrans.o \ - lib/sysacls.o lib/server_mutex.o \ - smbd/build_options.o smbd/service.o \ - smbd/rewrite.o $(SMBD_RPC_OBJ) \ - $(SMBD_NTVFS_OBJ) @SMBD_EXTRA_OBJS@ + smbd/session.o \ + smbd/password.o smbd/conn.o \ + smbd/negprot.o smbd/request.o \ + smbd/reply.o smbd/sesssetup.o \ + smbd/trans2.o smbd/search.o smbd/nttrans.o \ + lib/server_mutex.o \ + smbd/build_options.o smbd/service.o \ + smbd/rewrite.o $(SMBD_RPC_OBJ) \ + $(SMBD_NTVFS_OBJ) @SMBD_EXTRA_OBJS@ PROCESS_MODEL_OBJ = smbd/process.o smbd/process_model.o smbd/process_standard.o \ smbd/process_single.o diff --git a/source4/include/genparser.h b/source4/include/genparser.h index f28cd78249..a2ca227cab 100644 --- a/source4/include/genparser.h +++ b/source4/include/genparser.h @@ -16,6 +16,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #ifndef _GENPARSER_H #define _GENPARSER_H diff --git a/source4/include/genparser_samba.h b/source4/include/genparser_samba.h index 172ff2362c..1f5aeb582f 100644 --- a/source4/include/genparser_samba.h +++ b/source4/include/genparser_samba.h @@ -16,6 +16,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #ifndef _GENPARSER_SAMBA_H #define _GENPARSER_SAMBA_H diff --git a/source4/include/includes.h b/source4/include/includes.h index 6d796da6b3..2b83d14622 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -715,7 +715,6 @@ extern int errno; /* Lists, trees, caching, database... */ #include "xfile.h" -#include "intl.h" #include "dlinklist.h" #include "../tdb/tdb.h" #include "../tdb/spinlock.h" @@ -740,8 +739,6 @@ extern int errno; #include "byteorder.h" -#include "ntdomain.h" - #include "msdfs.h" #include "md5.h" @@ -752,8 +749,6 @@ extern int errno; #include "auth.h" #include "passdb.h" -#include "session.h" - #include "module.h" #include "asn_1.h" @@ -764,8 +759,6 @@ extern int errno; #include "nsswitch/winbind_client.h" -#include "genparser.h" - #include "mutex.h" #include "librpc/rpc/dcerpc.h" diff --git a/source4/include/intl.h b/source4/include/intl.h deleted file mode 100644 index 5b56d9aa2c..0000000000 --- a/source4/include/intl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Unix SMB/CIFS implementation. - internationalisation headers - Copyright (C) Andrew Tridgell 2001 - - 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. -*/ - - -/* ideally we would have a static mapping, but that precludes - dynamic loading. This is a reasonable compromise */ -#define _(x) lang_msg_rotate(x) diff --git a/source4/include/ntdomain.h b/source4/include/ntdomain.h deleted file mode 100644 index 354ac36e49..0000000000 --- a/source4/include/ntdomain.h +++ /dev/null @@ -1,31 +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 _NT_DOMAIN_H /* _NT_DOMAIN_H */ -#define _NT_DOMAIN_H - -#include "rpc_misc.h" -#include "rpc_creds.h" -#include "rpc_secdes.h" -#include "rpc_lsa.h" - -#endif /* _NT_DOMAIN_H */ diff --git a/source4/include/rpc_creds.h b/source4/include/rpc_creds.h index 3022b17289..f570f2eb77 100644 --- a/source4/include/rpc_creds.h +++ b/source4/include/rpc_creds.h @@ -20,6 +20,10 @@ */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #ifndef _RPC_CREDS_H /* _RPC_CREDS_H */ #define _RPC_CREDS_H diff --git a/source4/include/rpc_lsa.h b/source4/include/rpc_lsa.h index fb76546aa7..d0572ff87a 100644 --- a/source4/include/rpc_lsa.h +++ b/source4/include/rpc_lsa.h @@ -20,6 +20,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #ifndef _RPC_LSA_H /* _RPC_LSA_H */ #define _RPC_LSA_H diff --git a/source4/include/rpc_misc.h b/source4/include/rpc_misc.h index 8e7da30adc..430489a00d 100644 --- a/source4/include/rpc_misc.h +++ b/source4/include/rpc_misc.h @@ -20,8 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "ntdomain.h" - #ifndef _RPC_MISC_H /* _RPC_MISC_H */ #define _RPC_MISC_H diff --git a/source4/include/session.h b/source4/include/session.h deleted file mode 100644 index f613afee09..0000000000 --- a/source4/include/session.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Unix SMB/CIFS implementation. - session handling for recording currently vailid vuids - Copyright (C) tridge@samba.org 2001 - Copyright (C) Andew Bartlett <abartlet@samba.org> 2001 - - 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. -*/ - -/* a "session" is claimed when we do a SessionSetupX operation - and is yielded when the corresponding vuid is destroyed. - - sessions are used to populate utmp and PAM session structures -*/ - -struct sessionid { - uid_t uid; - gid_t gid; - fstring username; - fstring hostname; - fstring netbios_name; - fstring remote_machine; - fstring id_str; - uint32 id_num; - uint32 pid; - fstring ip_addr; -}; - diff --git a/source4/include/smb.h b/source4/include/smb.h index 89623895ed..e5e7e26444 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -236,9 +236,6 @@ typedef uint16 smb_ucs2_t; typedef smb_ucs2_t wpstring[PSTRING_LEN]; typedef smb_ucs2_t wfstring[FSTRING_LEN]; -/* This error code can go into the client smb_rw_error. */ -#define WRITE_ERROR 4 - #ifdef WORDS_BIGENDIAN #define UCS2_SHIFT 8 #else @@ -248,31 +245,6 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN]; /* turn a 7 bit character into a ucs2 character */ #define UCS2_CHAR(c) ((c) << UCS2_SHIFT) -/* pipe string names */ -#define PIPE_LANMAN "\\PIPE\\LANMAN" -#define PIPE_SRVSVC "\\PIPE\\srvsvc" -#define PIPE_SAMR "\\PIPE\\samr" -#define PIPE_WINREG "\\PIPE\\winreg" -#define PIPE_WKSSVC "\\PIPE\\wkssvc" -#define PIPE_NETLOGON "\\PIPE\\NETLOGON" -#define PIPE_NTLSA "\\PIPE\\ntlsa" -#define PIPE_NTSVCS "\\PIPE\\ntsvcs" -#define PIPE_LSASS "\\PIPE\\lsass" -#define PIPE_LSARPC "\\PIPE\\lsarpc" -#define PIPE_SPOOLSS "\\PIPE\\spoolss" -#define PIPE_NETDFS "\\PIPE\\netdfs" - -#define PI_LSARPC 0 -#define PI_LSARPC_DS 1 -#define PI_SAMR 2 -#define PI_NETLOGON 3 -#define PI_SRVSVC 4 -#define PI_WKSSVC 5 -#define PI_WINREG 6 -#define PI_SPOOLSS 7 -#define PI_NETDFS 8 -#define PI_MAX_PIPES 9 - /* Allowable account control bits */ #define ACB_DISABLED 0x0001 /* 1 = User account disabled */ #define ACB_HOMDIRREQ 0x0002 /* 1 = Home directory required */ @@ -344,49 +316,6 @@ typedef struct nt_user_token { DOM_SID *user_sids; } NT_USER_TOKEN; -/*** query a local group, get a list of these: shows who is in that group ***/ - -/* local group member info */ -typedef struct local_grp_member_info -{ - DOM_SID sid ; /* matches with name */ - uint8 sid_use; /* usr=1 grp=2 dom=3 alias=4 wkng=5 del=6 inv=7 unk=8 */ - fstring name ; /* matches with sid: must be of the form "DOMAIN\account" */ - -} LOCAL_GRP_MEMBER; - -/* enumerate these to get list of local groups */ - -/* local group info */ -typedef struct local_grp_info -{ - fstring name; - fstring comment; - -} LOCAL_GRP; - -/*** enumerate these to get list of domain groups ***/ - -/* domain group member info */ -typedef struct domain_grp_info -{ - fstring name; - fstring comment; - uint32 rid; /* group rid */ - uint8 attr; /* attributes forced to be set to 0x7: SE_GROUP_xxx */ - -} DOMAIN_GRP; - -/*** query a domain group, get a list of these: shows who is in that group ***/ - -/* domain group info */ -typedef struct domain_grp_member_info -{ - fstring name; - uint8 attr; /* attributes forced to be set to 0x7: SE_GROUP_xxx */ - -} DOMAIN_GRP_MEMBER; - /* 32 bit time (sec) since 01jan1970 - cifs6.txt, section 3.5, page 30 */ typedef struct time_info { @@ -400,56 +329,12 @@ typedef struct data_blob { void (*free)(struct data_blob *data_blob); } DATA_BLOB; -/* - * Structure used to keep directory state information around. - * Used in NT change-notify code. - */ - -typedef struct -{ - time_t modify_time; - time_t status_time; -} dir_status_struct; - -struct vuid_cache { - unsigned int entries; - uint16 list[VUID_CACHE_SIZE]; -}; - -/* Include VFS stuff */ - -#include "smb_acls.h" #include "enums.h" #include "events.h" #include "librpc/gen_ndr/ndr_misc.h" #include "smb_interfaces.h" #include "librpc/ndr/libndr.h" -typedef struct smb_vfs_handle_struct -{ - void *data; - /* Handle on dlopen() call */ - void *handle; - struct smb_vfs_handle_struct *next, *prev; - -} smb_vfs_handle_struct; - -struct current_user -{ - struct tcon_context *conn; - uint16 vuid; - uid_t uid; - gid_t gid; - int ngroups; - gid_t *groups; - NT_USER_TOKEN *nt_user_token; -}; - -/* Defines for the sent_oplock_break field above. */ -#define NO_BREAK_SENT 0 -#define EXCLUSIVE_BREAK_SENT 1 -#define LEVEL_II_BREAK_SENT 2 - typedef struct userdom_struct { fstring smb_name; /* user name from the client */ fstring unix_name; /* unix user name of a validated user */ @@ -457,6 +342,7 @@ typedef struct userdom_struct { fstring domain; /* domain that the client specified */ } userdom_struct; + /* used for server information: client, nameserv and ipc */ struct server_info_struct { @@ -1219,7 +1105,6 @@ struct pwd_info uchar sess_key[16]; }; -#include "rpc_creds.h" #include "rpc_misc.h" #include "rpc_secdes.h" @@ -1254,7 +1139,6 @@ typedef struct user_struct } user_struct; - struct unix_error_map { int unix_error; int dos_class; @@ -1262,8 +1146,6 @@ struct unix_error_map { NTSTATUS nt_error; }; -#include "ntdomain.h" - #include "client.h" /* diff --git a/source4/include/smb_acls.h b/source4/include/smb_acls.h index e7edb62bde..dc6ca30f9c 100644 --- a/source4/include/smb_acls.h +++ b/source4/include/smb_acls.h @@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #ifndef _SMB_ACLS_H #define _SMB_ACLS_H #if defined(HAVE_POSIX_ACLS) diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index f6a9fb0530..602df80671 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -73,47 +73,15 @@ #define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) -/* these are useful macros for checking validity of handles */ -#define OPEN_FSP(fsp) ((fsp) && !(fsp)->is_directory) -#define OPEN_CONN(conn) ((conn) && (conn)->open) -#define IS_IPC(conn) ((conn) && (conn)->ipc) -#define IS_PRINT(conn) ((conn) && (conn)->printer) -#define FNUM_OK(fsp,c) (OPEN_FSP(fsp) && (c)==(fsp)->conn) - -#define CHECK_FSP(fsp,conn) if (!FNUM_OK(fsp,conn)) \ - return(ERROR_DOS(ERRDOS,ERRbadfid)); \ - else if((fsp)->fd == -1) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) - -#define CHECK_READ(fsp) if (!(fsp)->can_read) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) -#define CHECK_WRITE(fsp) if (!(fsp)->can_write) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) - -#define CHECK_ERROR(fsp) if (HAS_CACHED_ERROR(fsp)) \ - return(CACHED_ERROR(fsp)) - -#define ERROR_WAS_LOCK_DENIED(status) (NT_STATUS_EQUAL((status), NT_STATUS_LOCK_NOT_GRANTED) || \ - NT_STATUS_EQUAL((status), NT_STATUS_FILE_LOCK_CONFLICT) ) - /* translates a connection number into a service number */ #define SNUM(conn) ((conn)?(conn)->service:-1) /* access various service details */ #define SERVICE(snum) (lp_servicename(snum)) -#define PRINTERNAME(snum) (lp_printername(snum)) +#define PRINTERNAME_NOTUSED(snum) (lp_printername(snum)) #define CAN_WRITE(conn) (!conn->read_only) #define VALID_SNUM(snum) (lp_snum_ok(snum)) #define GUEST_OK(snum) (VALID_SNUM(snum) && lp_guest_ok(snum)) -#define GUEST_ONLY(snum) (VALID_SNUM(snum) && lp_guest_only(snum)) -#define CAN_SETDIR(snum) (!lp_no_set_dir(snum)) -#define CAN_PRINT(conn) ((conn) && lp_print_ok((conn)->service)) -#define MAP_HIDDEN(conn) ((conn) && lp_map_hidden((conn)->service)) -#define MAP_SYSTEM(conn) ((conn) && lp_map_system((conn)->service)) -#define MAP_ARCHIVE(conn) ((conn) && lp_map_archive((conn)->service)) -#define IS_HIDDEN_PATH(conn,path) ((conn) && is_in_path((path),(conn)->hide_list)) -#define IS_VETO_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_list)) -#define IS_VETO_OPLOCK_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_oplock_list)) /* * Used by the stat cache code to check if a returned @@ -134,29 +102,6 @@ #define ABS(a) ((a)>0?(a):(-(a))) #endif -/* Macros to get at offsets within smb_lkrng and smb_unlkrng - structures. We cannot define these as actual structures - due to possible differences in structure packing - on different machines/compilers. */ - -#define SMB_LPID_OFFSET(indx) (10 * (indx)) -#define SMB_LKOFF_OFFSET(indx) ( 2 + (10 * (indx))) -#define SMB_LKLEN_OFFSET(indx) ( 6 + (10 * (indx))) -#define SMB_LARGE_LPID_OFFSET(indx) (20 * (indx)) -#define SMB_LARGE_LKOFF_OFFSET_HIGH(indx) (4 + (20 * (indx))) -#define SMB_LARGE_LKOFF_OFFSET_LOW(indx) (8 + (20 * (indx))) -#define SMB_LARGE_LKLEN_OFFSET_HIGH(indx) (12 + (20 * (indx))) -#define SMB_LARGE_LKLEN_OFFSET_LOW(indx) (16 + (20 * (indx))) - -/* Macro to cache an error in a write_bmpx_struct */ -#define CACHE_ERROR(w,c,e) ((w)->wr_errclass = (c), (w)->wr_error = (e), \ - w->wr_discard = True, -1) -/* Macro to test if an error has been cached for this fnum */ -#define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \ - (fsp)->wbmpx_ptr->wr_discard) -/* Macro to turn the cached error into an error packet */ -#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,__FILE__) - /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 @@ -167,8 +112,6 @@ /* this is how errors are generated */ #define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) -#define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x)) - /* REWRITE TODO: remove these smb_xxx macros */ #define smb_buf(buf) (((char *)(buf)) + MIN_SMB_SIZE + CVAL(buf,HDR_WCT+4)*2) @@ -239,52 +182,4 @@ copy an IP address from one buffer to another #define dos_format(fname) string_replace(fname,'/','\\') -/******************************************************************* - vfs stat wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_stat(conn, fname, st) ((conn)->vfs_ops.stat((conn), fname,(st))) - -/******************************************************************* - vfs lstat wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_lstat(conn, fname, st) ((conn)->vfs_ops.lstat((conn), fname,(st))) - -/******************************************************************* - vfs fstat wrapper -********************************************************************/ - -#define vfs_fstat(fsp, fd, st) ((fsp)->conn->vfs_ops.fstat((fsp),(fd),(st))) - -/******************************************************************* - vfs rmdir wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_rmdir(conn,fname) ((conn)->vfs_ops.rmdir((conn),fname)) - -/******************************************************************* - vfs Unlink wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_unlink(conn, fname) ((conn)->vfs_ops.unlink((conn),fname)) - -/******************************************************************* - vfs chmod wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_chmod(conn,fname,mode) ((conn)->vfs_ops.chmod((conn),fname,(mode))) - -/******************************************************************* - vfs chown wrapper that calls internal2unix. -********************************************************************/ - -#define vfs_chown(conn,fname,uid,gid) ((conn)->vfs_ops.chown((conn),fname,(uid),(gid))) - -/******************************************************************* - A wrapper for vfs_chdir(). -********************************************************************/ - -#define vfs_chdir(conn,fname) ((conn)->vfs_ops.chdir((conn),fname)) - #endif /* _SMB_MACROS_H */ diff --git a/source4/lib/smbrun.c b/source4/lib/smbrun.c index acb836ba7a..78f3d22ea0 100644 --- a/source4/lib/smbrun.c +++ b/source4/lib/smbrun.c @@ -20,13 +20,18 @@ #include "includes.h" -/* need to move this from here!! need some sleep ... */ -struct current_user current_user; +#if 1 +int smbrun(char *cmd, int *outfd) +{ + #warning smbrun() needs a rewrite: struct current_user is gone! + DEBUG(0,("smbrun() needs a rewrite: struct current_user is gone!\n")); + return -1; +} +#else /**************************************************************************** This is a utility function of smbrun(). ****************************************************************************/ - static int setup_out_fd(void) { int fd; @@ -169,3 +174,4 @@ int smbrun(char *cmd, int *outfd) exit(82); return 1; } +#endif diff --git a/source4/lib/talloctort.c b/source4/lib/talloctort.c index ad5de38581..9c10f4eed8 100644 --- a/source4/lib/talloctort.c +++ b/source4/lib/talloctort.c @@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #include "includes.h" #define NCTX 10 diff --git a/source4/lib/util_seaccess.c b/source4/lib/util_seaccess.c index eba8cab7fb..9d56a0d850 100644 --- a/source4/lib/util_seaccess.c +++ b/source4/lib/util_seaccess.c @@ -19,6 +19,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#error SAMBA4 clean up +#error this file should be (re)moved +#error and all unused stuff should go + #include "includes.h" extern DOM_SID global_sid_Builtin; |